From 9e1c45c6c64aa948eaa66a8f29fb4cca60cc495a Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Sat, 13 Apr 2024 22:51:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +- src/components/account.vue | 2 +- src/components/userChange.vue | 7 +- src/store/index.js | 30 +++---- .../equipmentCenter/equipmentCenterIndex.vue | 78 +++++++++++++++---- src/views/jxjadmin/systemSettings.vue | 2 +- src/views/projectAdmin/projectIndex.vue | 7 +- .../configManage/groupStructureManagement.vue | 11 ++- .../components/qualification-info.vue | 2 +- src/views/workSpace/index.vue | 9 ++- 10 files changed, 109 insertions(+), 43 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 3257741d..8fb2f65f 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://101.43.164.214:45020/' //沈阳和盈 @@ -92,7 +92,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 + axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/components/account.vue b/src/components/account.vue index 2725dab1..b794cd2c 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -389,7 +389,7 @@ export default { let routeUrl = ""; let type = this.$store.state.userInfo.accountType; // this.$store.commit("setProjectSn", value.projectSn); - if (type == 5 || type == 6) { + if (type == 5 || type == 6 || type == 10) { window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self"); window._paq.push(["trackEvent", "点击", "设备中台", "进入设备中台"]); } else { diff --git a/src/components/userChange.vue b/src/components/userChange.vue index 1e79cd64..efa9228b 100644 --- a/src/components/userChange.vue +++ b/src/components/userChange.vue @@ -141,6 +141,9 @@ export default { }, created() { this.getGroupTreeData(); + if(this.$store.state.projectSn){ + this.selectedProjectSn = this.$store.state.projectSn + } }, mounted() {}, methods: { @@ -169,7 +172,7 @@ export default { this.selectProject(item); }); } else { - if (!this.selectedProjectSn || !this.$store.state.projectSn) { + if (!this.selectedProjectSn || !this.$store.state.currentProDetail) { // 加判断是为了在循环中只选中第一个 this.selectedProjectSn = obj.sn; // 修改全局projectSn @@ -182,7 +185,7 @@ export default { // 设置树形的选中项目样式 setTreeActive(){ this.$nextTick(() => { - let activeSn = this.selectedProjectSn || this.$store.state.projectSn + let activeSn = this.$store.state.projectSn || this.selectedProjectSn if(activeSn){ this.$refs.tree.setCurrentKey(activeSn); } diff --git a/src/store/index.js b/src/store/index.js index 0ac5ef70..f5443062 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,22 +48,22 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/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://10.0.1.43:6023/upload/image',//测试 - // FILEURL:'http://10.0.1.43:6023/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://jxj.zhgdyun.com:15551/upload/image',//测试 + // FILEURL:'http://jxj.zhgdyun.com:15551/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://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址 + 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://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/equipmentCenter/equipmentCenterIndex.vue b/src/views/equipmentCenter/equipmentCenterIndex.vue index c27caea0..255b35c6 100644 --- a/src/views/equipmentCenter/equipmentCenterIndex.vue +++ b/src/views/equipmentCenter/equipmentCenterIndex.vue @@ -71,7 +71,7 @@