From 86308e197803292116ca24b7d82bb9c8ee91c82c Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 11 Dec 2023 18:55:46 +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 --- public/js/config.js | 2 +- src/assets/js/http.js | 4 +- src/router/index.js | 7 + .../projectFront/BIMCenter/overviewTwo.vue | 36 +- .../BIMCenter/progressManagement.vue | 399 ++++++++++++++++++ .../projectFront/BIMCenter/progressModel.html | 96 +++++ 6 files changed, 524 insertions(+), 20 deletions(-) create mode 100644 src/views/projectFront/BIMCenter/progressManagement.vue create mode 100644 src/views/projectFront/BIMCenter/progressModel.html diff --git a/public/js/config.js b/public/js/config.js index 802d4761..0a958e0f 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -20,7 +20,7 @@ var COMPANY = '' //通用 // COMPANY = 'shjg'//上海优益(上海建工) // COMPANY = 'syhy'//沈阳和盈 // COMPANY = 'jxwjj'//嘉兴王江泾公用码头项目 -// COMPANY = 'gxbs'//广西百色 +COMPANY = 'gxbs'//广西百色 var PROJECT = { local_test: 'common', // 普通版 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 29b0d1f5..82d899bb 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -82,12 +82,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) - axios.defaults.baseURL = 'http://192.168.34.221:30002/' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:30002/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30012/' //郭圣雄本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 + axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址 diff --git a/src/router/index.js b/src/router/index.js index 119c2052..b3a4ec81 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1190,6 +1190,13 @@ const routes2 = [ component: () => import('@/views/projectFront/BIMCenter/BIMManageV3.vue'), }, + //BIM中心-构件关联进度 + { + path: '/project/bim/componentProgress', + name: '构件关联进度', + component: () => + import('@/views/projectFront/BIMCenter/progressManagement.vue'), + }, //BIMBASE中心 { path: '/project/bim/bimBaseManage', diff --git a/src/views/projectFront/BIMCenter/overviewTwo.vue b/src/views/projectFront/BIMCenter/overviewTwo.vue index 2dcba17d..60faa023 100644 --- a/src/views/projectFront/BIMCenter/overviewTwo.vue +++ b/src/views/projectFront/BIMCenter/overviewTwo.vue @@ -142,24 +142,26 @@ export default { }, getIframeMessage(e) { console.log("Message from iframe:", e.data.msg); - if (this.formData.type == 1) { - let dataIndex = null; - dataIndex = this.selectedHideList.find((item) => { - return item == e.data.msg; - }); - if (!dataIndex) { - this.selectedHideList.push(e.data.msg); - } - } else { - let dataIndex = null; - dataIndex = this.selectedColorList.find((item) => { - return item.name == e.data.msg; - }); - if (!dataIndex) { - this.selectedColorList.push({ - name: e.data.msg, - color: this.formData.color, + if (e.data.msg) { + if (this.formData.type == 1) { + let dataIndex = null; + dataIndex = this.selectedHideList.find((item) => { + return item == e.data.msg; }); + if (!dataIndex) { + this.selectedHideList.push(e.data.msg); + } + } else { + let dataIndex = null; + dataIndex = this.selectedColorList.find((item) => { + return item.name == e.data.msg; + }); + if (!dataIndex) { + this.selectedColorList.push({ + name: e.data.msg, + color: this.formData.color, + }); + } } } }, diff --git a/src/views/projectFront/BIMCenter/progressManagement.vue b/src/views/projectFront/BIMCenter/progressManagement.vue new file mode 100644 index 00000000..111e4fa0 --- /dev/null +++ b/src/views/projectFront/BIMCenter/progressManagement.vue @@ -0,0 +1,399 @@ + + + + diff --git a/src/views/projectFront/BIMCenter/progressModel.html b/src/views/projectFront/BIMCenter/progressModel.html new file mode 100644 index 00000000..00395eac --- /dev/null +++ b/src/views/projectFront/BIMCenter/progressModel.html @@ -0,0 +1,96 @@ + + + + + My first BIMFACE app + + +
+ + + +