Merge branch 'master' of https://codeup.aliyun.com/645deca397d94d909e439238/iotplatform_sourcecode/screenFront into dismap

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="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
               <template v-slot>

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> -->

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="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
                   <template v-slot>

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="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
                   <template v-slot>

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="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
               <template v-slot>

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="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
-          <verticalNum ref="verticalNum7" :title="'TVOC'"></verticalNum>
+          <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
               <template v-slot>

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>

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'
         }
       }
+      if (title[0] == "厂区") {
+        pmData.unshift(temp)
+      } else {
         pmData.push(temp)
+      }
+      
 
     })
   }

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),

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>
@@ -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