From c294b38e82806e1edf0ae886b4dece7df576a55d Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 31 May 2023 17:24:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B2=89=E5=B0=98?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pmData/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/pmData/index.vue b/src/views/pmData/index.vue
index 4641c16..4997a46 100644
--- a/src/views/pmData/index.vue
+++ b/src/views/pmData/index.vue
@@ -35,6 +35,7 @@ let pmtest = ref({
   title: 'PM测试',
   value: { two: '44', ten: '51' }
 })
+document.title = t('messages.environment_dust')
 type pmData = {
   title: string,
   devId:string,
@@ -62,7 +63,12 @@ async function getData() {
           ten: '0'
         }
       }
-      pmData.push(temp)
+      if (title[0] == "厂区") {
+        pmData.unshift(temp)
+      } else {
+        pmData.push(temp)
+      }
+      
 
     })
   }

From 42d89077dffcee43452246a2b5a6a9162b651f7f Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 31 May 2023 17:52:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=92=8C=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=A4=A7=E5=B1=8F=20TVOC=E5=92=8C=E7=94=B2?=
 =?UTF-8?q?=E9=86=9B=E7=9B=91=E6=B5=8B=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/realtimeSecurity/content/content.vue              | 3 +++
 src/views/realtimeSecurityJixiefenchang/content/content.vue | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/views/realtimeSecurity/content/content.vue b/src/views/realtimeSecurity/content/content.vue
index 258f0b7..67e3a13 100644
--- a/src/views/realtimeSecurity/content/content.vue
+++ b/src/views/realtimeSecurity/content/content.vue
@@ -119,6 +119,9 @@ async function getSafeWarningDatafun(){
     let datetime = new Date().getTime();  
     let handle_vertical = result.data.map((item:any)=>{
       item.value.forEach(element => {
+        if (element.name.includes("TVOC")) {
+          element.name = element.name.split('TVOC')[0] + verticalType[item.type].title
+        }
         
         if (element.val>item.limit) {          
           element.date = gettime(element.ts),
diff --git a/src/views/realtimeSecurityJixiefenchang/content/content.vue b/src/views/realtimeSecurityJixiefenchang/content/content.vue
index 9c87577..f91b016 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/content.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/content.vue
@@ -138,6 +138,9 @@ async function getSafeWarningDatafun() {
     let handle_vertical = result.data.map((item: any) => {
       item.value.forEach(element => {
 
+        if (element.name.includes("TVOC")) {
+          element.name = element.name.split('TVOC')[0] + verticalType[item.type].title
+        }
         if (element.val > item.limit) {
           element.date = gettime(element.ts),
             element.time = element.ts || datetime

From 79f1c6892c276d1c2c7a3745b8f053c5beab1bae Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 31 May 2023 18:04:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=A2=B0?=
 =?UTF-8?q?=E5=88=86=E5=8E=82=E4=BA=94=E4=B8=AA=E8=BD=A6=E9=97=B4=20?=
 =?UTF-8?q?=E7=94=B2=E9=86=9B=E7=9B=91=E6=B5=8B=E5=92=8CTVOC=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PaintShopView/View1/top.vue                       | 4 ++--
 src/views/PaintShopView/components/verticalNum.vue          | 2 +-
 src/views/PaintShopView/finishView/top.vue                  | 4 ++--
 src/views/PaintShopView/machiningView/top.vue               | 4 ++--
 src/views/PaintShopView/stuffView/top.vue                   | 4 ++--
 src/views/PaintShopView/weldView/top.vue                    | 4 ++--
 src/views/environment/content/left.vue                      | 2 +-
 src/views/realtimeSecurityJixiefenchang/content/content.vue | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue
index e42a089..b873f9c 100644
--- a/src/views/PaintShopView/View1/top.vue
+++ b/src/views/PaintShopView/View1/top.vue
@@ -15,8 +15,8 @@
           <verticalNum ref="verticalNum3" :title="t('messages.gasDetection')"></verticalNum>
           <verticalNum ref="verticalNum5" :title="t('messages.smokeDetection')"></verticalNum>
           <verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
-          <verticalNum ref="verticalNum6" :title="t('messages.CH2Ojiance')"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
               <template v-slot>
diff --git a/src/views/PaintShopView/components/verticalNum.vue b/src/views/PaintShopView/components/verticalNum.vue
index 8f21441..eb0b005 100644
--- a/src/views/PaintShopView/components/verticalNum.vue
+++ b/src/views/PaintShopView/components/verticalNum.vue
@@ -12,7 +12,7 @@
     <border6 ref="refborder3">
       <template v-slot>
         <div class="box" ref="classBox1">
-          <h2>{{ item.name }}</h2>
+          <h2>{{ props.title }}</h2>
           <h5 v-if="value.unit">{{ `${t('messages.NormalValue')}0-${value.quota}${value.unit}` }}</h5>
           <h5 v-else>&nbsp; </h5>
           <!-- <h2>{{ `${t(item.i18n[0])}${t(item.i18n[1])}`}}</h2> -->
diff --git a/src/views/PaintShopView/finishView/top.vue b/src/views/PaintShopView/finishView/top.vue
index 02dac30..ea913a8 100644
--- a/src/views/PaintShopView/finishView/top.vue
+++ b/src/views/PaintShopView/finishView/top.vue
@@ -15,8 +15,8 @@
           <!-- <verticalNum ref="verticalNum3" :title="'燃气检测'"></verticalNum> -->
           <!-- <verticalNum ref="verticalNum5" :title="'烟雾检测'"></verticalNum> -->
           <verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
-          <verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
                   <template v-slot>
diff --git a/src/views/PaintShopView/machiningView/top.vue b/src/views/PaintShopView/machiningView/top.vue
index d579b4c..9056166 100644
--- a/src/views/PaintShopView/machiningView/top.vue
+++ b/src/views/PaintShopView/machiningView/top.vue
@@ -15,8 +15,8 @@
           <!-- <verticalNum ref="verticalNum3" :title="'燃气检测'"></verticalNum>
           <verticalNum ref="verticalNum5" :title="'烟雾检测'"></verticalNum> -->
           <verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
-          <verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
                   <template v-slot>
diff --git a/src/views/PaintShopView/stuffView/top.vue b/src/views/PaintShopView/stuffView/top.vue
index 04054da..2b87281 100644
--- a/src/views/PaintShopView/stuffView/top.vue
+++ b/src/views/PaintShopView/stuffView/top.vue
@@ -15,8 +15,8 @@
           <!-- <verticalNum ref="verticalNum3" :title="'燃气检测'"></verticalNum>
           <verticalNum ref="verticalNum5" :title="'烟雾检测'"></verticalNum> -->
           <verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
-          <verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
               <template v-slot>
diff --git a/src/views/PaintShopView/weldView/top.vue b/src/views/PaintShopView/weldView/top.vue
index 4206eed..968ed99 100644
--- a/src/views/PaintShopView/weldView/top.vue
+++ b/src/views/PaintShopView/weldView/top.vue
@@ -15,8 +15,8 @@
           <!-- <verticalNum ref="verticalNum3" :title="'燃气检测'"></verticalNum> -->
           <!-- <verticalNum ref="verticalNum5" :title="'烟雾检测'"></verticalNum> -->
           <verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
-          <verticalNum ref="verticalNum6" :title="'甲醛监测'"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
               <template v-slot>
diff --git a/src/views/environment/content/left.vue b/src/views/environment/content/left.vue
index e178f30..a47bf2f 100644
--- a/src/views/environment/content/left.vue
+++ b/src/views/environment/content/left.vue
@@ -14,7 +14,7 @@
           <border2 ref="ReffinishArofene">
                <template v-slot>
                    <div class="content-LR" ref="finishArofene">
-                     <verticalNum :title="`${t('messages.JingShiRoom')}(${t('messages.CH2Ojiance')})`" :data="0.132" :unit="'mg/m3'" :quota="1" :iconname="'icon-app_icons--'"></verticalNum>
+                     <verticalNum :title="`${t('messages.JingShiRoom')}(${t('messages.CH2ODetection')})`" :data="0.132" :unit="'mg/m3'" :quota="1" :iconname="'icon-app_icons--'"></verticalNum>
                    </div>
                </template>
            </border2>
diff --git a/src/views/realtimeSecurityJixiefenchang/content/content.vue b/src/views/realtimeSecurityJixiefenchang/content/content.vue
index f91b016..fc6c6ab 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/content.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/content.vue
@@ -9,7 +9,7 @@
       <verticalNum ref="verticalNum3" :title="`喷漆${t('messages.gasDetection')}`"></verticalNum>
       <verticalNum ref="verticalNum4" :title="t('messages.flameDetection')"></verticalNum>
       <verticalNum ref="verticalNum5" :title="t('messages.smokeDetection')"></verticalNum>
-      <verticalNum ref="verticalNum6" :title="`${t('messages.JingShiRoom')}(${t('messages.CH2Ojiance')})`"></verticalNum>
+      <verticalNum ref="verticalNum6" :title="`${t('messages.JingShiRoom')}(${t('messages.CH2ODetection')})`"></verticalNum>
       <verticalNum ref="verticalNum7" :title="`${t('messages.JingShiRoom')}TVOC`"></verticalNum>
     </div>
     <div>