admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx：冲突

Browse Source
This commit is contained in:
”Rain“ 2024-06-03 21:17:54 +08:00
commit 68216a02cb
4 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/http.js
View File

@ -85,7 +85,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈

48
src/store/index.js
View File

@ -85,30 +85,30 @@ export default new Vuex.Store({
// tag: 部署河南项目时，需要打开这两行代码
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/api/upload/image", //金林湾部署地址
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址
// FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
// tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
/* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/api/upload/image", //金林湾部署地址
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址
// FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
// tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
/* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码
// UPLOADURL: 'http://139.9.66.234:6324/upload/image',
// FILEURL: 'http://139.9.66.234:6324/image/',

10
src/views/projectFront/laborManage/dataValidation.vue
View File

@ -151,7 +151,7 @@ export default {
this.$message.success(res.message);
this.getHikvisionPage();
}else {
this.$message.error(res.message);
this.$message.error(res.result.msg);
}
})
},
@ -165,9 +165,10 @@ export default {
projectSn: this.projectSn,
type: type,
}).then((res) => {
console.log(res);
if (res.code == 200) {
this.$message.success(res.message);
}else {
this.$message.error(res.message);
}
})
},
@ -192,6 +193,7 @@ export default {
projectSn: this.projectSn,
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
type: Number(this.activeName),
}).then((res) => {
if (res.code == 200) {
this.tableList = res.result.records;
@ -224,10 +226,12 @@ export default {
//切换条数
sizeChange(val) {
this.pagInfo.pageSize = val;
this.getHikvisionPage();
},
//切换页数
currentChange(val) {
this.pagInfo.pageNo = val;
this.getHikvisionPage();
},
},
};

2
src/views/projectFront/specialWork/blindPlugWork.vue
View File

@ -248,7 +248,7 @@
{{ workDetail.safetyWorkTicketCode }}
</el-form-item> -->
<el-form-item label="实际作业开始时间：" :label-width="formLabelWidthDetail">
<el-date-picker v-model="workDetail.actualJobBeginTime" type="datetimerange"
<el-date-picker v-model="workDetail.workExecutionBeginTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail">
</el-date-picker>
</el-form-item>