From b4a64b9e3450aad27f93c3d896a79ebccff55daf Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Thu, 1 Jun 2023 17:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B2=BE=E9=A5=B0=E8=BD=A6?=
 =?UTF-8?q?=E9=97=B4=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PaintShopView/View1/top.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue
index b873f9c..c7aa413 100644
--- a/src/views/PaintShopView/View1/top.vue
+++ b/src/views/PaintShopView/View1/top.vue
@@ -12,11 +12,12 @@
     <el-row>
       <el-col :span="24">
         <div style="display: flex;justify-content: space-evenly; align-items: center; margin-bottom: 10px;">
-          <verticalNum ref="verticalNum3" :title="t('messages.gasDetection')"></verticalNum>
+          <verticalNum ref="verticalNum3" :title="t('messages.flameDetection')"></verticalNum>
           <verticalNum ref="verticalNum5" :title="t('messages.smokeDetection')"></verticalNum>
           <verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
           <verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
           <verticalNum ref="verticalNum7" :title="t('messages.TVOCDetection')"></verticalNum>
+          <verticalNum ref="verticalNum8" :title="t('messages.gasDetection')"></verticalNum>
           <div>
             <border6 ref="borderref">
               <template v-slot>
@@ -53,6 +54,7 @@ let verticalNum4 = ref();
 let verticalNum5 = ref();
 let verticalNum6 = ref();
 let verticalNum7 = ref();
+let verticalNum8 = ref();
 let borderref = ref()
 let humidityref = ref()
 let ductref = ref()
@@ -87,6 +89,7 @@ const powerBox = (width: any, height: any) => {
   verticalNum5.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20)
   verticalNum6.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20)
   verticalNum7.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20)
+  verticalNum8.value.setchartWH(a.oWidth * 3.42 - 20, a.oHeight - 20)
   humidityref.value.setchartWH(a.oWidth * 3.42 - 40, a.oHeight - 40)
   ductref.value.setchartWH(a.oWidth * 3.48 - 20, a.oHeight - 20);
 };
@@ -264,11 +267,12 @@ function setcontentData(val) {
   let noise = val.noise.map((item) => {
     return { name: item.name, val: item.data,status:item.status };
   });
-  verticalNum3.value.setData(val.FIRE, 'icon-ranqi', 0, "")
+  verticalNum3.value.setData(val.FIRE, 'icon-weibiaoti1', 0, "")
   verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB")
   verticalNum5.value.setData(Smoke, 'icon-yanwubaojingqi', 100, "PPM")
   verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3")
   verticalNum7.value.setData(TVOC, 'icon-TVOC-Outlined', 0.5, "mg/m3")
+  verticalNum8.value.setData(val.Methane, 'icon-ranqi', 0, "")
   // console.log(pmref.value);
   humidityref.value.setData({ h: val.temp_humi[temp_humi_index].huim, c: val.temp_humi[temp_humi_index].temp, title: val.temp_humi[temp_humi_index].name })
   if (val.temp_humi.length > 1) {