diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 18cd6272..28ac18c0 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,7 +84,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/' //彭洁远程 @@ -97,7 +97,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // 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://42.180.188.17:11211/"; //鞍钢测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址 } 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 a738dc15..086b8534 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -52,25 +52,25 @@ export default new Vuex.Store({ // 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", //坤工作流地址(本地) + // 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/", //正式环境 + 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", //鞍钢测试平台工作流地址 + WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/projectFront/configManage/personnelAccess.vue b/src/views/projectFront/configManage/personnelAccess.vue index 93122eb7..78852609 100644 --- a/src/views/projectFront/configManage/personnelAccess.vue +++ b/src/views/projectFront/configManage/personnelAccess.vue @@ -59,9 +59,16 @@ - {{ - $t("message.alarmWarning.query") - }} + {{ $t("message.alarmWarning.query") }} - {{ - $t("message.videoManage.add") - }} + {{ $t("message.videoManage.add") }} {{ $t("message.projectInfo.configVideo") }} -
+
{{ $t("message.alarmValueSet.edit") }}
-
+
{ + this.$refs.treeRef.setChecked(item.id, true, true); + }); + } + }, handleTreeCheckAllChange(val) { this.isIndeterminate = false; if (this.checkAll == true) { for (let i = 0; i < this.treeDatas.length; i++) { this.$refs.treeRef.setChecked(this.treeDatas[i].id, true, true); + if (this.treeDatas[i].children) { + this.handleTreeCheckAllFn(this.treeDatas[i].children); + } } } else { this.$refs.treeRef.setCheckedKeys([]); @@ -815,7 +864,7 @@ export default { this.$nextTick(() => { this.$refs.treeRef.setCheckedKeys([]); arr.map((item) => { - this.$refs.treeRef.setChecked(this.findNodeById(item),true); + this.$refs.treeRef.setChecked(this.findNodeById(item), true); }); }); } @@ -823,9 +872,12 @@ export default { }, findNodeById(id) { function findNode(nodes, id) { - for(let i = 0;i 0 }; + for (let i = 0; i < nodes.length; i++) { + if (nodes[i].id === id) { + return { + node: nodes[i], + hasChildren: !!nodes[i].children && nodes[i].children.length > 0, + }; } if (nodes[i].children && nodes[i].children.length > 0) { const found = findNode(nodes[i].children, id); @@ -838,7 +890,7 @@ export default { if (!result.hasChildren) { return id; } else { - return "" + return ""; } }, // configFn(item) { diff --git a/src/views/projectFront/progressManagementAg/ganttChart.vue b/src/views/projectFront/progressManagementAg/ganttChart.vue index d7439e91..f553f741 100644 --- a/src/views/projectFront/progressManagementAg/ganttChart.vue +++ b/src/views/projectFront/progressManagementAg/ganttChart.vue @@ -1018,6 +1018,7 @@ export default { this.searchSn = this.$store.state.projectSn; this.getHierarchyEnterpriseList(); this.getPositionList(); + this.getXzMilestoneListData(); }, computed: { dates() {