diff --git a/src/assets/i18n/langs/cn/companyAdmin/companyDiagram.js b/src/assets/i18n/langs/cn/companyAdmin/companyDiagram.js index 82bfaf60..82aa1339 100644 --- a/src/assets/i18n/langs/cn/companyAdmin/companyDiagram.js +++ b/src/assets/i18n/langs/cn/companyAdmin/companyDiagram.js @@ -177,8 +177,8 @@ export default { qualityManage: '质量管理', // sunRainTable: '晴雨表', devAlarm:'设备报警', - rectificationQualityQuestion: '已整改安全问题', - noRectificationQualityQuestion: '未整改安全问题', + rectificationQualityQuestion: '已整改', + noRectificationQualityQuestion: '未整改', alarmRecord: '报警列表', noData: '暂无数据', optionList:[ diff --git a/src/assets/images/dataBoard/bg.jpg b/src/assets/images/dataBoard/bg.jpg new file mode 100644 index 00000000..3dd85ef3 Binary files /dev/null and b/src/assets/images/dataBoard/bg.jpg differ diff --git a/src/assets/images/dataBoard/bgImg.png b/src/assets/images/dataBoard/bgImg.png new file mode 100644 index 00000000..5f186734 Binary files /dev/null and b/src/assets/images/dataBoard/bgImg.png differ diff --git a/src/assets/images/dataBoard/dlzs.png b/src/assets/images/dataBoard/dlzs.png new file mode 100644 index 00000000..1d18738a Binary files /dev/null and b/src/assets/images/dataBoard/dlzs.png differ diff --git a/src/assets/images/dataBoard/hjjcs.png b/src/assets/images/dataBoard/hjjcs.png new file mode 100644 index 00000000..0fa9f2f4 Binary files /dev/null and b/src/assets/images/dataBoard/hjjcs.png differ diff --git a/src/assets/images/dataBoard/hygl.png b/src/assets/images/dataBoard/hygl.png new file mode 100644 index 00000000..f3ded632 Binary files /dev/null and b/src/assets/images/dataBoard/hygl.png differ diff --git a/src/assets/images/dataBoard/led_logo.png b/src/assets/images/dataBoard/led_logo.png new file mode 100644 index 00000000..690a159f Binary files /dev/null and b/src/assets/images/dataBoard/led_logo.png differ diff --git a/src/assets/images/dataBoard/rygs1.png b/src/assets/images/dataBoard/rygs1.png new file mode 100644 index 00000000..7c558fb0 Binary files /dev/null and b/src/assets/images/dataBoard/rygs1.png differ diff --git a/src/assets/images/dataBoard/rygs1_1.png b/src/assets/images/dataBoard/rygs1_1.png new file mode 100644 index 00000000..60fc02a9 Binary files /dev/null and b/src/assets/images/dataBoard/rygs1_1.png differ diff --git a/src/assets/images/dataBoard/rygs2.png b/src/assets/images/dataBoard/rygs2.png new file mode 100644 index 00000000..ad99d4bb Binary files /dev/null and b/src/assets/images/dataBoard/rygs2.png differ diff --git a/src/assets/images/dataBoard/rygs_botom.png b/src/assets/images/dataBoard/rygs_botom.png new file mode 100644 index 00000000..58e79918 Binary files /dev/null and b/src/assets/images/dataBoard/rygs_botom.png differ diff --git a/src/assets/images/dataBoard/wisdomBuild/cim+.png b/src/assets/images/dataBoard/wisdomBuild/cim+.png index cb1ff8f5..139d4460 100644 Binary files a/src/assets/images/dataBoard/wisdomBuild/cim+.png and b/src/assets/images/dataBoard/wisdomBuild/cim+.png differ diff --git a/src/assets/images/dataBoard/wisdomBuild/cim+1.png b/src/assets/images/dataBoard/wisdomBuild/cim+1.png new file mode 100644 index 00000000..cb1ff8f5 Binary files /dev/null and b/src/assets/images/dataBoard/wisdomBuild/cim+1.png differ diff --git a/src/assets/images/dataBoard/wisdomBuild/main.png b/src/assets/images/dataBoard/wisdomBuild/main.png index a2bddd07..4fed33b7 100644 Binary files a/src/assets/images/dataBoard/wisdomBuild/main.png and b/src/assets/images/dataBoard/wisdomBuild/main.png differ diff --git a/src/assets/images/dataBoard/wisdomBuild/main1.png b/src/assets/images/dataBoard/wisdomBuild/main1.png new file mode 100644 index 00000000..a2bddd07 Binary files /dev/null and b/src/assets/images/dataBoard/wisdomBuild/main1.png differ diff --git a/src/assets/images/dataBoard/wisdomBuild/map.jpg b/src/assets/images/dataBoard/wisdomBuild/map.jpg index f0738a02..92628df7 100644 Binary files a/src/assets/images/dataBoard/wisdomBuild/map.jpg and b/src/assets/images/dataBoard/wisdomBuild/map.jpg differ diff --git a/src/assets/images/dataBoard/wisdomBuild/map1.jpg b/src/assets/images/dataBoard/wisdomBuild/map1.jpg new file mode 100644 index 00000000..f0738a02 Binary files /dev/null and b/src/assets/images/dataBoard/wisdomBuild/map1.jpg differ diff --git a/src/assets/images/dataBoard/wisdomBuild/tab2.png b/src/assets/images/dataBoard/wisdomBuild/tab2.png index 19352d79..3e7de508 100644 Binary files a/src/assets/images/dataBoard/wisdomBuild/tab2.png and b/src/assets/images/dataBoard/wisdomBuild/tab2.png differ diff --git a/src/assets/images/dataBoard/wisdomBuild/tab21.png b/src/assets/images/dataBoard/wisdomBuild/tab21.png new file mode 100644 index 00000000..19352d79 Binary files /dev/null and b/src/assets/images/dataBoard/wisdomBuild/tab21.png differ diff --git a/src/assets/images/dataBoard/znsb.png b/src/assets/images/dataBoard/znsb.png new file mode 100644 index 00000000..95218d01 Binary files /dev/null and b/src/assets/images/dataBoard/znsb.png differ diff --git a/src/assets/images/qualityManage/hygl.png b/src/assets/images/qualityManage/hygl.png index 558a62c2..8663573b 100644 Binary files a/src/assets/images/qualityManage/hygl.png and b/src/assets/images/qualityManage/hygl.png differ diff --git a/src/assets/images/qualityManage/hygl2 (2).png b/src/assets/images/qualityManage/hygl2 (2).png new file mode 100644 index 00000000..558a62c2 Binary files /dev/null and b/src/assets/images/qualityManage/hygl2 (2).png differ diff --git a/src/assets/images/qualityManage/hygl2.png b/src/assets/images/qualityManage/hygl2.png index 41cd34ba..7f6bbb3e 100644 Binary files a/src/assets/images/qualityManage/hygl2.png and b/src/assets/images/qualityManage/hygl2.png differ diff --git a/src/assets/images/qualityManage/hygl21.png b/src/assets/images/qualityManage/hygl21.png new file mode 100644 index 00000000..41cd34ba Binary files /dev/null and b/src/assets/images/qualityManage/hygl21.png differ diff --git a/src/assets/images/qualityManage/hygl3.png b/src/assets/images/qualityManage/hygl3.png new file mode 100644 index 00000000..61bc1654 Binary files /dev/null and b/src/assets/images/qualityManage/hygl3.png differ diff --git a/src/assets/images/zjbigScreen/binscreen.png b/src/assets/images/zjbigScreen/binscreen.png index e723e26a..a11bf7ca 100644 Binary files a/src/assets/images/zjbigScreen/binscreen.png and b/src/assets/images/zjbigScreen/binscreen.png differ diff --git a/src/assets/images/zjbigScreen/binscreen1.png b/src/assets/images/zjbigScreen/binscreen1.png new file mode 100644 index 00000000..e723e26a Binary files /dev/null and b/src/assets/images/zjbigScreen/binscreen1.png differ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 9090d649..d45acd48 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,7 +40,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // tag: 本地 - axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 + axios.defaults.baseURL = 'http://139.9.66.234:8/'; //本地 http/1.1 // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲 // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 // axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲 @@ -73,6 +73,7 @@ else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = window.location.protocol + "//" + host + "/" // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/" // axios.defaults.baseURL = 'http://192.168.34.125:6023/'; + axios.defaults.baseURL = 'http://139.9.66.234:8/' // axios.defaults.baseURL = 'http://zhgd.loganwy.com/' } diff --git a/src/router/index.js b/src/router/index.js index b423f3b0..a31f5c88 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1399,6 +1399,7 @@ const routes2 = [ name: '数据看板', // component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve), component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve), + children: [{ path: 'index', name: '数据看板-首页概览', @@ -1447,74 +1448,77 @@ const routes2 = [ component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'), } ] - // children: [{ - // path: 'index', - // name: '数据看板-首页概览', - // component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'), - // }, { - // path: 'digitalSite', - // name: '数据看板-数字工地', - // component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'), - // }, { - // path: 'laborManage', - // name: '数据看板-劳务管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'), - // }, { - // path: 'environment', - // name: '数据看板-环境监测', - // component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'), - // }, - // { - // path: 'material', - // name: '数据看板-材料管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'), - // }, - // { - // path: 'plan', - // name: '数据看板-进度计划', - // component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'), - // }, - // { - // path: 'secure', - // name: '数据看板-安全管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'), - // }, - // { - // path: 'quality', - // name: '数据看板-质量管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'), - // }, - // { - // path: 'SixHundred', - // name: '数据看板-六个百分百', - // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'), - // }, - // { - // path: 'AiAnalysis', - // name: '数据看板-AI数据分析', - // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'), - // }, - // { - // path: 'contractManage', - // name: '数据看板-合约管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'), - // }, - // { - // path: 'doublecManage', - // name: '数据看板-双碳管理', - // component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'), - // }, - // { - // path: 'bigScreen', - // name: '数据看板-监控大屏', - // component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'), - // }, - // { - // path: 'cimManage', - // name: '数据看板-CIM+', - // component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'), - // } - // ] + + + // children: [{ + // path: 'index', + // name: '数据看板-首页概览', + // component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'), + // }, { + // path: 'digitalSite', + // name: '数据看板-数字工地', + // component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'), + // }, { + // path: 'laborManage', + // name: '数据看板-劳务管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'), + // }, { + // path: 'environment', + // name: '数据看板-环境监测', + // component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'), + // }, + // { + // path: 'material', + // name: '数据看板-材料管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'), + // }, + // { + // path: 'plan', + // name: '数据看板-进度计划', + // component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'), + // }, + // { + // path: 'secure', + // name: '数据看板-安全管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'), + // }, + // { + // path: 'quality', + // name: '数据看板-质量管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'), + // }, + // { + // path: 'SixHundred', + // name: '数据看板-六个百分百', + // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'), + // }, + // { + // path: 'AiAnalysis', + // name: '数据看板-AI数据分析', + // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'), + // }, + { + path: 'contractManage', + name: '数据看板-合约管理', + component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'), + }, + { + path: 'doublecManage', + name: '数据看板-双碳管理', + component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'), + }, + { + path: 'bigScreen', + name: '数据看板-监控大屏', + component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'), + }, + { + path: 'cimManage', + name: '数据看板-CIM+', + component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'), + } + ] + }, { path: '/equipmentCenter/', diff --git a/src/views/projectAdmin/dataBoard/dataBoard.vue b/src/views/projectAdmin/dataBoard/dataBoard.vue index eaaac6ef..469f3437 100644 --- a/src/views/projectAdmin/dataBoard/dataBoard.vue +++ b/src/views/projectAdmin/dataBoard/dataBoard.vue @@ -1,193 +1,229 @@ diff --git a/src/views/projectAdmin/dataBoard/style.less b/src/views/projectAdmin/dataBoard/style.less index 9234ca62..aa664f9d 100644 --- a/src/views/projectAdmin/dataBoard/style.less +++ b/src/views/projectAdmin/dataBoard/style.less @@ -1,5 +1,7 @@ .dataBoardPage{ - background-color: #040D15; + // background-color: rgba(8,93,150, 1); + background-image: url(../../../assets/images/dataBoard/bgImg.png); + position: relative; color: rgba(255, 255, 255, 0.8); } @@ -88,7 +90,7 @@ } } /deep/.blockBox{ - height: calc(33.33% - 25px); + height: calc(33.33% - 100px); margin-bottom: 25px; width: 100%; position: relative; @@ -269,7 +271,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png'); .top{ height: 57%; - background-image: url('../../../assets/images/dataBoard/centerTopBG.png');; + // background-image: url('../../../assets/images/dataBoard/centerTopBG.png'); background-size: 100% 100%; background-position: center; background-repeat: no-repeat; @@ -279,7 +281,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png'); .bottom{ margin: 10px 20px; height: calc(43% - 20px); - background-image: url('../../../assets/images/dataBoard/centerBottomBG.png'); + // background-image: url('../../../assets/images/dataBoard/centerBottomBG.png'); background-size: 100% 100%; background-position: center; background-repeat: no-repeat; @@ -372,10 +374,12 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png'); .bottomInner{ width: calc(100% - 60px); margin: 0 30px; + margin-top: 130px; } .timeBox{ display: flex; - justify-content: space-between; + justify-content: center; + // justify-content: space-between; align-items: center; } .timeInner{ @@ -581,6 +585,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png'); margin-left: 0; margin-right: 0; width: 100%; + margin-top: 130px; } .top{ height: 60%; diff --git a/src/views/projectAdmin/dataBoardTwo/contractManage.vue b/src/views/projectAdmin/dataBoardTwo/contractManage.vue index 1ffb966d..8b8a58cb 100644 --- a/src/views/projectAdmin/dataBoardTwo/contractManage.vue +++ b/src/views/projectAdmin/dataBoardTwo/contractManage.vue @@ -1,12 +1,12 @@ diff --git a/src/views/projectAdmin/dataBoardTwo/index copy.vue b/src/views/projectAdmin/dataBoardTwo/index copy.vue new file mode 100644 index 00000000..e05ed3f8 --- /dev/null +++ b/src/views/projectAdmin/dataBoardTwo/index copy.vue @@ -0,0 +1,1867 @@ + + + diff --git a/src/views/projectAdmin/dataBoardTwo/index.vue b/src/views/projectAdmin/dataBoardTwo/index.vue index cfa4bc10..dad5285f 100644 --- a/src/views/projectAdmin/dataBoardTwo/index.vue +++ b/src/views/projectAdmin/dataBoardTwo/index.vue @@ -4,37 +4,37 @@
- {{ $t("message.companyDiagram.projectInfo") }} + {{ $t('message.companyDiagram.projectInfo') }}
- - + +
{{ $t("message.companyDiagram.entryName1") }}：{{ $t('message.companyDiagram.entryName1') }}： {{ projectData.projectName }}
{{ $t("message.companyDiagram.projectAddress") }}：{{ $t('message.companyDiagram.projectAddress') }}： {{ projectData.provinceName }}{{ projectData.cityName @@ -42,45 +42,46 @@ }}{{ projectData.projectAddress }}
+
{{ $t("message.companyDiagram.projectManager") }}：{{ $t('message.companyDiagram.projectManager') }}： {{ projectData.projectManage }}
{{ $t("message.companyDiagram.telPhone") }}：{{ $t('message.companyDiagram.telPhone') }}： {{ projectData.projectTel }}
{{ $t("message.companyDiagram.buildArea") }}：{{ $t('message.companyDiagram.buildArea') }}： {{ projectData.projectAcreage }} m²
{{ $t("message.companyDiagram.buildStartTime") }}：{{ $t('message.companyDiagram.buildStartTime') }}： {{ projectData.startWorkDate }}
{{ $t("message.companyDiagram.projectNo") }}：{{ $t('message.companyDiagram.projectNo') }}： {{ projectData.projectNumber }}
{{ $t("message.companyDiagram.projectType") }}：{{ $t('message.companyDiagram.projectType') }}： {{ $t("message.companyDiagram.projectUse") }}：{{ $t('message.companyDiagram.projectUse') }}： {{ $t("message.companyDiagram.structureType") }}：{{ $t('message.companyDiagram.structureType') }}： {{ $t("message.companyDiagram.projectStatus") }}：{{ $t('message.companyDiagram.projectStatus') }}： {{ item.name }}
- - - - -
- -
- {{ $t("message.companyDiagram.peopleOverview") }} -
-
-
- -
-

- {{ statisticsCount.workercount.totalPerson }} -

- -

{{ $t("message.companyDiagram.registerPeopleNum") }}

+ +
+ + {{ $t('message.companyDiagram.entryName1') }}： + {{ projectData.projectName }}
-
-
- -
-

- {{ statisticsCount.presencecount.lwPersonTotal }} -

- -

{{ $t("message.companyDiagram.onlineLabourPeople") }}

-
-
-
-
- -

{{ $t("message.companyDiagram.onlineManagePeople") }}

+
+ + {{ $t('message.companyDiagram.projectAddress') }}： + {{ projectData.provinceName }}{{ projectData.cityName + }}{{ projectData.areaName + }}{{ projectData.projectAddress }}
-
-
-
- {{ - statisticsCount.presencecount.jfGlPersonTotal - }} - / - {{ statisticsCount.workercount.jfGlPersonTotal }} -

- - {{ $t("message.dataBoard.PartyAPersonnel") }} -

-
-
- -
-
-
-
- {{ - statisticsCount.presencecount.jlGlPersonTotal - }} - / - {{ statisticsCount.workercount.jlGlPersonTotal }} -

- - {{ $t("message.dataBoard.supervisoryStaff") }} -

-
-
- -
-
-
-
- {{ - statisticsCount.presencecount.yfGlPersonTotal - }} - / - {{ statisticsCount.workercount.yfGlPersonTotal }} -

- - {{ $t("message.dataBoard.PartyBPersonnel") }} -

-
-
- -
-
+
+ + {{ $t('message.companyDiagram.projectManager') }}： + {{ projectData.projectManage }}
+
+ + {{ $t('message.companyDiagram.telPhone') }}： + {{ projectData.projectTel }} +
+
+ + {{ $t('message.companyDiagram.buildArea') }}： + {{ projectData.projectAcreage }} m² +
+
+ + {{ $t('message.companyDiagram.buildStartTime') }}： + {{ projectData.startWorkDate }} +
+
+ + {{ $t('message.companyDiagram.projectNo') }}： + {{ projectData.projectNumber }} +
+
+ + {{ $t('message.companyDiagram.projectType') }}： + {{ item.name }} +
+
+ + {{ $t('message.companyDiagram.projectUse') }}： + {{ item.name }} +
+
+ + {{ $t('message.companyDiagram.structureType') }}： + {{ item.name }} +
+
+ + {{ $t('message.companyDiagram.projectStatus') }}： + {{ item.name }} +
+ +
+ + {{ $t('message.companyDiagram.entryName1') }}： + {{ projectData.projectName }} +
+
+ + {{ $t('message.companyDiagram.projectAddress') }}： + {{ projectData.provinceName }}{{ projectData.cityName + }}{{ projectData.areaName + }}{{ projectData.projectAddress }} +
+ +
+ + {{ $t('message.companyDiagram.projectManager') }}： + {{ projectData.projectManage }} +
+
+ + {{ $t('message.companyDiagram.telPhone') }}： + {{ projectData.projectTel }} +
+
+ + {{ $t('message.companyDiagram.buildArea') }}： + {{ projectData.projectAcreage }} m² +
+
+ + {{ $t('message.companyDiagram.buildStartTime') }}： + {{ projectData.startWorkDate }} +
+
+ + {{ $t('message.companyDiagram.projectNo') }}： + {{ projectData.projectNumber }} +
+
+ + {{ $t('message.companyDiagram.projectType') }}： + {{ item.name }} +
+
+ + {{ $t('message.companyDiagram.projectUse') }}： + {{ item.name }} +
+
+ + {{ $t('message.companyDiagram.structureType') }}： + {{ item.name }} +
+
+ + {{ $t('message.companyDiagram.projectStatus') }}： + {{ item.name }} +
+
+
+
+
+ +
+ {{ $t('message.companyDiagram.peopleOverview') }} +
+
+
+ + +
+
+ +
+
+
-
- -
- {{ $t("message.companyDiagram.smartDev") }} +
+ "> +
智能设备
+
+
-
-
- - - - - - +
+
+ "> +
合约管理
+
+ +
- -
-
- {{ item.name }} -
-
- -
- - - {{ - $t("message.companyDiagram.changeImg") - }} - - - -
-
- -

- {{ $t("message.videoManage.empty") }}, - - - {{ $t("message.companyDiagram.uploadImg") }} - -

-
- - - {{ - $t("message.companyDiagram.changeVideo") - }} - - +
- {{ $t("message.companyDiagram.planStatus") }} + {{ $t('message.companyDiagram.planStatus') }}
-
- {{ $t("message.companyDiagram.countDown") }} +
+ {{ $t('message.companyDiagram.countDown') }}
-
-
- -

{{ $t("message.companyDiagram.projectDayNum") }}

-
- - {{ projectData.totalProjectDay }} - {{ $t("message.companyDiagram.day") }} -
-
-
- -

{{ $t("message.companyDiagram.projectResidueDay") }}

-
- - {{ projectData.surplusDay }} - {{ $t("message.companyDiagram.day") }} -
+
+ +

{{ $t('message.companyDiagram.projectDayNum') }}

+
+ + {{ projectData.totalProjectDay }} + {{ $t('message.companyDiagram.day') }}
+
+ +

{{ $t('message.companyDiagram.projectResidueDay') }}

+
+ + {{ projectData.surplusDay }} + {{ $t('message.companyDiagram.day') }} +
+
+
-
+
-
- {{ $t("message.companyDiagram.milestone") }} +
+ {{ $t('message.companyDiagram.milestone') }}
@@ -460,7 +512,7 @@ v-if="COMPANY == 'longguang' || enabledProjectV2 == 3" class="blockTitle" > - {{ $t("message.companyDiagram.environmentMonitor") }} + {{ $t('message.companyDiagram.environmentMonitor') }}
@@ -493,7 +545,7 @@

{{ item.tem2 }} ~ {{ item.tem1 }}

- {{ $t("message.environmentalOverview.wind_power") }} + {{ $t('message.environmentalOverview.wind_power') }} {{ item.win_speed }}

@@ -504,53 +556,55 @@

PM2.5

-

{{ plantCap.pm25 ? plantCap.pm25 : "--" }}μg/m3

+

{{ plantCap.pm25 ? plantCap.pm25 : '--' }}μg/m3

PM10

-

{{ plantCap.pm10 ? plantCap.pm10 : "--" }}μg/m3

+

{{ plantCap.pm10 ? plantCap.pm10 : '--' }}μg/m3

噪声

-

{{ plantCap.noise ? plantCap.noise : "--" }}db

+

{{ plantCap.noise ? plantCap.noise : '--' }}db

-
- {{ $t("message.companyDiagram.safeManage") }} + {{ $t('message.companyDiagram.safeManage') }}
-
-
+
+

{{ $t("message.companyDiagram.rectificationSafeQuestion") }} + >{{ $t('message.companyDiagram.rectificationSafeQuestion') }}

{{ secureData.completeNum }}

+

{{ - $t("message.companyDiagram.noRectificationSafeQuestion") + $t('message.companyDiagram.noRectificationSafeQuestion') }}

{{ secureData.rectificationNum }}

@@ -563,16 +617,17 @@
- {{ $t("message.companyDiagram.qualityManage") }} + {{ $t('message.companyDiagram.qualityManage') }}
-
- {{ $t("message.companyDiagram.devAlarm") }} +
+ {{ $t('message.companyDiagram.devAlarm') }}
-
+
{{ - $t("message.companyDiagram.rectificationQualityQuestion") + $t('message.companyDiagram.rectificationQualityQuestion') }}

{{ qualityData.completeNum }}

+ +

+ + 已验收 +

+

51

+
+
+
+

{{ - $t("message.companyDiagram.noRectificationQualityQuestion") + $t('message.companyDiagram.noRectificationQualityQuestion') }}

{{ qualityData.rectificationNum }}

+ +
+ +

+ + 待验收 + +

+

52

+
@@ -692,74 +769,33 @@
-
+
- {{ $t("message.companyDiagram.environmentMonitor") }} + {{ $t('message.companyDiagram.environmentMonitor') }}
- -
- {{ $t("message.companyDiagram.alarmRecord") }} +
+
-
- -
-
- - -
- - - - - -
- -
{{ item.projectName }}
- -
- 预警类型：{{ item.alarmType }} -
-
- 抓拍点：{{ item.location }} -
-
- 抓拍设备：{{ item.hardwareName }} -
-
- 预警时间时间：{{ item.createTime }} -
-
-
-
- - -

{{ $t("message.companyDiagram.noData") }}

-
- +
+
+ +
点亮展示
+
+
@@ -797,6 +833,7 @@ export default { components: { devNumChart, airQulityChart }, data() { return { + ry_switch: 0, COMPANY: "", ops: { vuescroll: { @@ -955,8 +992,32 @@ export default { this.getAlarmList(); this.getAlarmInfor(); this.getDevList(); + + setInterval(() => { + if (this.ry_switch == 0) { + this.ry_switch = 1 + } else { + this.ry_switch = 0 + } + }, 2000) }, methods: { + toenvironment(){ + console.log('===========') + this.$router.push({path:"/project/dataBoard/environment"}) + }, + toquality(){ + console.log('===========') + this.$router.push({path:"/project/dataBoard/quality"}) + }, + toznsb(){ + console.log('===========') + this.$router.push({path:"/project/dataBoard/digitalSite"}) + }, + tohygl(){ + console.log('===========') + this.$router.push({path:"/project/dataBoard/contractManage"}) + }, createdEchart2() { let chart2 = echarts.init(this.$refs["echart2"]); this.chart2 = chart2; @@ -1039,7 +1100,7 @@ export default { this.statisticsCount.devcount.videoNum, this.statisticsCount.devcount.ufaceDevNum, this.statisticsCount.devcount.lifterDevNum + - this.statisticsCount.devcount.towerDevNum, + this.statisticsCount.devcount.towerDevNum, this.statisticsCount.devcount.environmentDevNum, ], type: "bar", @@ -1495,7 +1556,7 @@ export default { } .listItem { color: white; - font-size: 15px; + font-size: 18px; .label { opacity: 0.8; } @@ -1540,7 +1601,7 @@ export default { .bottomInner { padding-left: 20px; &::before { - content: ""; + content: ''; position: absolute; top: 38px; left: 0; @@ -1569,7 +1630,7 @@ export default { .bottomInner { padding-left: 20px; &::before { - content: ""; + content: ''; position: absolute; top: 38px; left: 0; @@ -1586,7 +1647,7 @@ export default { height: 60%; .managePeopleTitle { &::before { - content: ""; + content: ''; background-color: #6ce9f0; width: 5px; height: 5px; diff --git a/src/views/projectAdmin/dataBoardTwo/style.less b/src/views/projectAdmin/dataBoardTwo/style.less index c44205f6..ebf011f2 100644 --- a/src/views/projectAdmin/dataBoardTwo/style.less +++ b/src/views/projectAdmin/dataBoardTwo/style.less @@ -88,7 +88,8 @@ } } /deep/.blockBox{ - height: calc(33.33% - 25px); + // height: calc(33.33% - 25px); + height: calc(33.33% -100px); margin-bottom: 25px; width: 100%; position: relative; @@ -269,7 +270,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png'); .top{ height: 57%; - background-image: url('../../../assets/images/dataBoardTwo/top.png');; + // background-image: url('../../../assets/images/dataBoardTwo/top.png'); background-size: 100% 100%; background-position: center; background-repeat: no-repeat; @@ -372,10 +373,11 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png'); .bottomInner{ width: calc(100% - 60px); margin: 0 30px; + margin-top: 130px; } .timeBox{ display: flex; - justify-content: space-between; + justify-content: center; align-items: center; } .timeInner{ @@ -581,6 +583,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png'); margin-left: 0; margin-right: 0; width: 100%; + } .top{ height: 60%;