From a99094632a52e261d786a644dd26b507d8ef5efa Mon Sep 17 00:00:00 2001 From: yjl <1490736767@qq.com> Date: Thu, 30 Mar 2023 13:40:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=9E=97=E6=B9=BE=E5=A4=A7=E5=B1=8F-?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9B=91=E6=B5=8B=E5=A2=9E=E5=8A=A0=E5=99=AA?= =?UTF-8?q?=E9=9F=B3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../langs/cn/environmentalMonitor/overview.js | 8 +- .../langs/en/environmentalMonitor/overview.js | 9 +- .../jlw/envirManage/centerTop.vue | 349 +++--- .../jlw/envirManage/leftCenter.vue | 73 +- .../environmentalMonitor/overview.vue | 1025 +++++++++-------- 5 files changed, 786 insertions(+), 678 deletions(-) diff --git a/src/assets/i18n/langs/cn/environmentalMonitor/overview.js b/src/assets/i18n/langs/cn/environmentalMonitor/overview.js index 9e75d5d7..cfdb0eea 100644 --- a/src/assets/i18n/langs/cn/environmentalMonitor/overview.js +++ b/src/assets/i18n/langs/cn/environmentalMonitor/overview.js @@ -73,7 +73,13 @@ export default { value: "东", id:7, unit:'风' - } + }, + { + name: "噪音", + value: "101", + id:9, + unit:'dB' + }, // , { // name: "气压", // value: "101", diff --git a/src/assets/i18n/langs/en/environmentalMonitor/overview.js b/src/assets/i18n/langs/en/environmentalMonitor/overview.js index e9939b9b..6ee5466c 100644 --- a/src/assets/i18n/langs/en/environmentalMonitor/overview.js +++ b/src/assets/i18n/langs/en/environmentalMonitor/overview.js @@ -73,12 +73,19 @@ export default { value: "东", id:7, unit:'风' - }, { + }, + { name: "气压", value: "101", id:8, unit:'kPa' }, + { + name: "噪音", + value: "101", + id:9, + unit:'dB' + }, ], //演示模拟数据 diff --git a/src/views/projectAdmin/jlw/envirManage/centerTop.vue b/src/views/projectAdmin/jlw/envirManage/centerTop.vue index 1cbf9cbf..ec198b6e 100644 --- a/src/views/projectAdmin/jlw/envirManage/centerTop.vue +++ b/src/views/projectAdmin/jlw/envirManage/centerTop.vue @@ -2,14 +2,21 @@
- +
  • {{ item.deviceName }}
  • + > + {{ item.deviceName }} +

diff --git a/src/views/projectFront/environmentalMonitor/overview.vue b/src/views/projectFront/environmentalMonitor/overview.vue index b4cf29c9..dfaed40f 100644 --- a/src/views/projectFront/environmentalMonitor/overview.vue +++ b/src/views/projectFront/environmentalMonitor/overview.vue @@ -3,7 +3,7 @@

{{ $store.state.currentProDetail.projectName }} - - {{ $t("message.environmentalOverview.title") }} + {{ $t('message.environmentalOverview.title') }}

@@ -15,7 +15,7 @@
-

{{ $t("message.environmentalOverview.e1") }}

+

{{ $t('message.environmentalOverview.e1') }}

@@ -30,31 +30,31 @@ " >
- {{ $t("message.projectSummary.actor") }} + {{ $t('message.projectSummary.actor') }}
- {{ $t("message.projectSummary.fine") }} + {{ $t('message.projectSummary.fine') }}
- {{ $t("message.projectSummary.mildContamination") }} + {{ $t('message.projectSummary.mildContamination') }}
- {{ $t("message.projectSummary.middleLevelPollution") }} + {{ $t('message.projectSummary.middleLevelPollution') }}
- {{ $t("message.projectSummary.actheavyPollutionor") }} + {{ $t('message.projectSummary.actheavyPollutionor') }}
@@ -67,7 +67,7 @@ " >
- {{ $t("message.projectSummary.severeContamination") }} + {{ $t('message.projectSummary.severeContamination') }}
@@ -75,7 +75,7 @@
-

{{ $t("message.environmentalOverview.e4") }}

+

{{ $t('message.environmentalOverview.e4') }}

@@ -83,27 +83,28 @@ - {{ $t("message.environmentalOverview.table.th1") }} + {{ $t('message.environmentalOverview.table.th1') }} - {{ $t("message.environmentalOverview.table.th2") }} + {{ $t('message.environmentalOverview.table.th2') }} - {{ $t("message.environmentalOverview.table.th3") }} + {{ $t('message.environmentalOverview.table.th3') }} - - {{ item.deviceName }} - + + {{ item.deviceName }} {{ item.deviceId }} - - @@ -111,11 +112,14 @@ -
- +
+

- {{$t('message.projectInfo.noData')}} + {{ $t('message.projectInfo.noData') }}

@@ -124,7 +128,7 @@
-

{{ $t("message.environmentalOverview.e2") }}

+

{{ $t('message.environmentalOverview.e2') }}

    @@ -154,7 +158,7 @@
    -

    {{ $t("message.environmentalOverview.e3") }}

    +

    {{ $t('message.environmentalOverview.e3') }}

    @@ -162,18 +166,18 @@ - {{ $t("message.environmentalOverview.table2.th1") }} + {{ $t('message.environmentalOverview.table2.th1') }} - {{ $t("message.environmentalOverview.table2.th2") }} + {{ $t('message.environmentalOverview.table2.th2') }} - {{ $t("message.environmentalOverview.table2.th3") }} + {{ $t('message.environmentalOverview.table2.th3') }} - + {{ item.deviceName }} @@ -182,11 +186,14 @@ -
    - +
    +

    - - {{$t('message.projectInfo.noData')}} + + {{ $t('message.projectInfo.noData') }}

    @@ -194,11 +201,18 @@
    -

    {{ $t("message.environmentalOverview.e5") }}

    +

    {{ $t('message.environmentalOverview.e5') }}

    - + - {{ $t("message.environmentalOverview.e5SelectArr")[0].title }} + {{ $t('message.environmentalOverview.e5SelectArr')[0].title }} - + - {{ $t("message.environmentalOverview.e5SelectArr")[1].title }} + {{ $t('message.environmentalOverview.e5SelectArr')[1].title }}
    @@ -226,84 +247,102 @@ {{ - $t("message.environmentalOverview.typeList")[0] + $t('message.environmentalOverview.typeList')[0] }} {{airAnalysis.length>0?airAnalysis[0].num:0}}{{ $t("message.environmentalOverview.Days") }}{{ airAnalysis.length > 0 ? airAnalysis[0].num : 0 + }}{{ $t('message.environmentalOverview.Days') }}
  • {{ - $t("message.environmentalOverview.typeList")[1] + $t('message.environmentalOverview.typeList')[1] }} {{airAnalysis.length>0?airAnalysis[1].num:0}}{{ $t("message.environmentalOverview.Days") }}{{ airAnalysis.length > 0 ? airAnalysis[1].num : 0 + }}{{ $t('message.environmentalOverview.Days') }}
  • {{ - $t("message.environmentalOverview.typeList")[2] + $t('message.environmentalOverview.typeList')[2] }} {{airAnalysis.length>0?airAnalysis[2].num:0}}{{ $t("message.environmentalOverview.Days") }}{{ airAnalysis.length > 0 ? airAnalysis[2].num : 0 + }}{{ $t('message.environmentalOverview.Days') }}
  • {{ - $t("message.environmentalOverview.typeList")[3] + $t('message.environmentalOverview.typeList')[3] }} {{airAnalysis.length>0?airAnalysis[3].num:0}}{{ $t("message.environmentalOverview.Days") }}{{ airAnalysis.length > 0 ? airAnalysis[3].num : 0 + }}{{ $t('message.environmentalOverview.Days') }}
  • {{ - $t("message.environmentalOverview.typeList")[4] + $t('message.environmentalOverview.typeList')[4] }} {{airAnalysis.length>0?airAnalysis[4].num:0}}{{ $t("message.environmentalOverview.Days") }}{{ airAnalysis.length > 0 ? airAnalysis[4].num : 0 + }}{{ $t('message.environmentalOverview.Days') }}
  • {{ - $t("message.environmentalOverview.typeList")[5] + $t('message.environmentalOverview.typeList')[5] }} {{airAnalysis.length>0?airAnalysis[5].num:0}}{{ $t("message.environmentalOverview.Days") }}{{ airAnalysis.length > 0 ? airAnalysis[5].num : 0 + }}{{ $t('message.environmentalOverview.Days') }}
@@ -316,11 +355,15 @@
-

{{ $t("message.environmentalOverview.e6") }}

+

{{ $t('message.environmentalOverview.e6') }}

- + - {{ $t("message.environmentalOverview.e6SelectArr")[0].title }} + {{ $t('message.environmentalOverview.e6SelectArr')[0].title }} - + - {{ $t("message.environmentalOverview.e6SelectArr")[1].title }} + {{ $t('message.environmentalOverview.e6SelectArr')[1].title }} - + - {{ $t("message.environmentalOverview.e6SelectArr")[2].title }} + {{ $t('message.environmentalOverview.e6SelectArr')[2].title }} - + - {{ $t("message.environmentalOverview.e6SelectArr")[3].title }} + {{ $t('message.environmentalOverview.e6SelectArr')[3].title }}
-
- +
+

- {{$t('message.projectInfo.noData')}} + {{ $t('message.projectInfo.noData') }}

-

{{ $t("message.environmentalOverview.e7") }}

+

{{ $t('message.environmentalOverview.e7') }}

@@ -411,7 +469,7 @@

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

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

@@ -422,120 +480,133 @@