From 3b1edfa952e96060c9900253611ff4493d8e2676 Mon Sep 17 00:00:00 2001 From: Luck-Xiaomi <1569717859@qq.com> Date: Mon, 29 Aug 2022 16:31:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F=EF=BC=9A?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E8=8B=A5=E5=B9=B2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 1 + src/router/index.js | 4 +- .../jlw/{CIM => BIM}/BimCoordination.vue | 4 +- .../projectAdmin/jlw/{CIM => BIM}/Model.vue | 0 .../projectAdmin/jlw/{CIM => BIM}/index.vue | 0 .../jlw/{CIM => BIM}/leftCenter.vue | 0 .../projectAdmin/jlw/{CIM => BIM}/leftTop.vue | 0 .../jlw/{CIM => BIM}/rightCenter.vue | 0 .../jlw/{CIM => BIM}/rightTop.vue | 0 .../assets/images/bg/bg-rectangular-box.png | Bin 0 -> 5710 bytes .../projectAdmin/jlw/components/CountList.vue | 8 +- .../projectAdmin/jlw/digitalSite/index.vue | 25 ++- .../projectAdmin/jlw/digitalSite/rightTop.vue | 3 +- .../jlw/envirManage/rightBottom.vue | 8 +- .../projectAdmin/jlw/laborManage/leftTop.vue | 44 +++--- .../jlw/planProgress/centerTop.vue | 148 ++++++++++++------ .../jlw/planProgress/leftBottom.vue | 9 ++ .../projectAdmin/jlw/planProgress/leftTop.vue | 10 +- .../jlw/projectHuli/projectIntro.vue | 105 +++++-------- .../jlw/qualityManage/leftBottom.vue | 4 +- .../projectAdmin/jlw/safeManage/index.vue | 13 ++ .../jlw/safeManage/leftBottom.vue | 2 + .../projectAdmin/jlw/safeManage/leftTop.vue | 38 +++-- .../projectAdmin/jlw/safeManage/rightTop.vue | 12 +- 24 files changed, 252 insertions(+), 186 deletions(-) rename src/views/projectAdmin/jlw/{CIM => BIM}/BimCoordination.vue (94%) rename src/views/projectAdmin/jlw/{CIM => BIM}/Model.vue (100%) rename src/views/projectAdmin/jlw/{CIM => BIM}/index.vue (100%) rename src/views/projectAdmin/jlw/{CIM => BIM}/leftCenter.vue (100%) rename src/views/projectAdmin/jlw/{CIM => BIM}/leftTop.vue (100%) rename src/views/projectAdmin/jlw/{CIM => BIM}/rightCenter.vue (100%) rename src/views/projectAdmin/jlw/{CIM => BIM}/rightTop.vue (100%) create mode 100644 src/views/projectAdmin/jlw/assets/images/bg/bg-rectangular-box.png diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 74dd0c14..bef83c94 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -95,6 +95,7 @@ if (store.state.userInfo) { // http请求拦截器 axios.interceptors.request.use( config => { + if (config.url.includes('live?port')) return config // 分屏插件兼容配置 const screensBaseURL = sessionStorage.getItem('screens-baseURL') if (config.url.indexOf(screensBaseURL) !== -1) { diff --git a/src/router/index.js b/src/router/index.js index 39e5df23..587c31e6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1694,8 +1694,8 @@ const routes2 = [ }, { path: 'cim', - name: '数据看板-CIM', - component: () => import('@/views/projectAdmin/jlw/CIM/index.vue') + name: '数据看板-BIM', + component: () => import('@/views/projectAdmin/jlw/BIM/index.vue') }, { path: 'safe', diff --git a/src/views/projectAdmin/jlw/CIM/BimCoordination.vue b/src/views/projectAdmin/jlw/BIM/BimCoordination.vue similarity index 94% rename from src/views/projectAdmin/jlw/CIM/BimCoordination.vue rename to src/views/projectAdmin/jlw/BIM/BimCoordination.vue index de83431c..c430a6dc 100644 --- a/src/views/projectAdmin/jlw/CIM/BimCoordination.vue +++ b/src/views/projectAdmin/jlw/BIM/BimCoordination.vue @@ -1,7 +1,7 @@ @@ -72,6 +70,7 @@ export default { diff --git a/src/views/projectAdmin/jlw/planProgress/leftTop.vue b/src/views/projectAdmin/jlw/planProgress/leftTop.vue index 74d52caa..5891a7d9 100644 --- a/src/views/projectAdmin/jlw/planProgress/leftTop.vue +++ b/src/views/projectAdmin/jlw/planProgress/leftTop.vue @@ -4,7 +4,7 @@
-

+

{{$t('message.dataBoard.projectCountDown')+':'}}

@@ -15,7 +15,7 @@ {{$t('message.dataBoard.textList')[0]}}
- +

{{$t('message.dataBoard.completeTime')+':'}}{{endDate}} @@ -202,7 +202,7 @@ export default { } .days { position: absolute; - top: 40%; + top: 45%; left: 50%; transform: translate(-50%, -50%); .num { @@ -211,14 +211,14 @@ export default { } .daysBG { position: absolute; - top: 40%; + top: 45%; left: 50%; transform: translate(-50%, -50%); } .endDate { position: absolute; right: 20px; - bottom: 60px; + bottom: 30px; // font-size: 13px; } } diff --git a/src/views/projectAdmin/jlw/projectHuli/projectIntro.vue b/src/views/projectAdmin/jlw/projectHuli/projectIntro.vue index e8ecfc88..38e2f541 100644 --- a/src/views/projectAdmin/jlw/projectHuli/projectIntro.vue +++ b/src/views/projectAdmin/jlw/projectHuli/projectIntro.vue @@ -1,20 +1,16 @@ @@ -38,11 +52,7 @@ export default { default: '' } }, - mounted() { - getNewestSecurityManageDataList2Api({ projectSn: this.projectSn }).then(res => { - this.alarmList = res.result || [] - }) - }, + data() { return { projectSn: this.$store.state.projectSn, @@ -60,7 +70,13 @@ export default { // ].reverse(), // seriesData: [100, 235, 232, 532, 112, 532, 449, 269, 998] } - } + }, + mounted() { + getNewestSecurityManageDataList2Api({ projectSn: this.projectSn }).then(res => { + console.log('待整改问题: ', res); + this.alarmList = res.result || [] + }) + }, } @@ -87,14 +103,15 @@ export default { height: 30px; line-height: 30px; &:nth-child(1) { - width: 160px; + width: 150px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } &:nth-child(2) { - padding-left: 10px; - flex: 1; + // padding-left: 10px; + // flex: 1; + width: 100px; } &:nth-child(3) { width: 140px; @@ -106,4 +123,5 @@ export default { } } } + diff --git a/src/views/projectAdmin/jlw/safeManage/rightTop.vue b/src/views/projectAdmin/jlw/safeManage/rightTop.vue index 9b14c546..9d2cb1ea 100644 --- a/src/views/projectAdmin/jlw/safeManage/rightTop.vue +++ b/src/views/projectAdmin/jlw/safeManage/rightTop.vue @@ -56,19 +56,17 @@ export default { default: '' } }, - data: () => ({ - // 日期范围 - dateRange: [], - }), - mounted() { - this.getCounts() - }, data() { return { + // 日期范围 + dateRange: [], projectSn: this.$store.state.projectSn, totals: {} } }, + mounted() { + this.getCounts() + }, methods: { getCounts() { selectSecurityManageStatisticsApi({ projectSn: this.projectSn }).then(res => {