diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 01d7a8c2..b1444d9d 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -173,7 +173,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // 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.221:9111/"; //郭圣雄本地 // 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/' //彭洁远程 @@ -187,7 +187,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 - axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; diff --git a/src/store/index.js b/src/store/index.js index e9e66d20..6cb7d067 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -44,46 +44,45 @@ export default new Vuex.Store({ }), ], - state: { - PAGESIZRS: [10, 20, 30, 50], - // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 - // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - // UPLOADURL:'http://182.90.224.237:51234/upload/image/', - // FILEURL:'http://182.90.224.237:51234/image/', - // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 - // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 - UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 - FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 - // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) - WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) - // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 - // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 - // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 - // FILEURL:'http://42.180.188.17:11211/image/',//测试 - 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: 部署河南项目时，需要打开这两行代码 + state: { + PAGESIZRS: [10, 20, 30, 50], + // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 + // FILEURL:' http://101.43.164.214:11111/image/',// 百色 + // UPLOADURL:'http://182.90.224.237:51234/upload/image/', + // FILEURL:'http://182.90.224.237:51234/image/', + // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 + // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 + UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 + FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 + // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) + WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) + // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 + // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 + // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 + // FILEURL:'http://42.180.188.17:11211/image/',//测试 + // 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 + "/", //正式环境 diff --git a/src/views/projectFront/configManage/groupStructureManagement.vue b/src/views/projectFront/configManage/groupStructureManagement.vue index 48919549..024cd685 100644 --- a/src/views/projectFront/configManage/groupStructureManagement.vue +++ b/src/views/projectFront/configManage/groupStructureManagement.vue @@ -127,8 +127,8 @@ class="dialogFormBox" :rules="formRules" > + @@ -453,7 +453,13 @@ export default { this.title = "编辑组织"; this.addEditForm = JSON.parse(JSON.stringify(obj)); - this.selectVal = obj.deptName; + if(obj.parentId != "0"){ + // this.selectVal = obj.deptName; + this.selectParentId(this.List, obj.parentId) + } else { + this.selectVal = ""; + } + // if (this.addEditForm.parentObj) { // this.selectTreeData = JSON.parse(this.addEditForm.parentObj); // this.selectVal = this.selectTreeData.deptName; @@ -471,6 +477,21 @@ export default { } }); }, + selectParentId(data, parentId){ + // console.log(data); + // let resultName = ""; + data.some(item => { + if(item.id == parentId){ + this.selectVal = item.deptName; + console.log(item.id, parentId, item.id == parentId, item) + return true + } + if(item.children.length > 0) { + this.selectParentId(item.children, parentId); + } + }) + // return resultName; + }, deleteDev(obj) { console.log("删除", obj); this.$confirm( diff --git a/src/views/projectFront/laborManage/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue index 90b05f7d..f958f35b 100644 --- a/src/views/projectFront/laborManage/dataValidation.vue +++ b/src/views/projectFront/laborManage/dataValidation.vue @@ -221,7 +221,7 @@ export default { }).then((res) => { if (res.code == 200) { this.$message.success(res.message); - // this.getHikvisionPage(); + this.getHikvisionPage(); } else { this.$message.error(res.message); } @@ -311,6 +311,7 @@ export default { .tables { min-height: 535px; + max-height: calc(100% - 128px); } .pagerBox { diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue index a2ee61e7..c404fdbe 100644 --- a/src/views/projectFront/laborManage/personDetails.vue +++ b/src/views/projectFront/laborManage/personDetails.vue @@ -157,7 +157,7 @@
- + 导出教育档案
diff --git a/src/views/projectFront/progressManagementAg/progressApproval.vue b/src/views/projectFront/progressManagementAg/progressApproval.vue index 59b268da..cf823ad6 100644 --- a/src/views/projectFront/progressManagementAg/progressApproval.vue +++ b/src/views/projectFront/progressManagementAg/progressApproval.vue @@ -145,7 +145,7 @@