From 24a18a8f9b3d7429c6402f4fe23aa69ca61b2595 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Tue, 16 May 2023 16:58:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PaintShopView/View1/top.vue         |   4 +-
 .../PaintShopView/components/verticalNum.vue  | 180 +++++++++---------
 src/views/PaintShopView/finishView/top.vue    |   2 +-
 src/views/PaintShopView/machiningView/top.vue |   2 +-
 4 files changed, 96 insertions(+), 92 deletions(-)

diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue
index 86535cf..662ee0c 100644
--- a/src/views/PaintShopView/View1/top.vue
+++ b/src/views/PaintShopView/View1/top.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\PaintShopView\View1\top.vue
+ * @FilePath: \gitscreenFront\src\views\PaintShopView\View1\top.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 14:43:28
@@ -266,7 +266,7 @@ function setcontentData(val) {
   });
   verticalNum3.value.setData(val.FIRE, 'icon-ranqi', 0, "")
   verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB")
-  verticalNum5.value.setData(Smoke, 'icon-yanwubaojingqi', 100, "")
+  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")
   // console.log(pmref.value);
diff --git a/src/views/PaintShopView/components/verticalNum.vue b/src/views/PaintShopView/components/verticalNum.vue
index a726480..56a330a 100644
--- a/src/views/PaintShopView/components/verticalNum.vue
+++ b/src/views/PaintShopView/components/verticalNum.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\PaintShopView\components\verticalNum.vue
+ * @FilePath: \gitscreenFront\src\views\PaintShopView\components\verticalNum.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 08:22:35
@@ -117,23 +117,24 @@ defineExpose({
 <style scoped>
 @import "@/assets/css/iconfont.css";
 
+
 .box {
-  height: 50%;
-  width: 100%;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-evenly;
-  align-items: center;
-}
-
-.box>h5 {
-  font-size: 15px;
-  /* margin-bottom: 20px; */
-  margin-top: 20px;
-}
-
-/* .contentbox{
+    height: 50%;
+    width: 100%;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-evenly;
+    align-items: center;
+  }
+  
+  .box>h5 {
+    font-size: 15px;
+    /* margin-bottom: 20px; */
+    margin-top: 20px;
+  }
+  
+  /* .contentbox{
     height: 100%;
     width: 100%;
     display: flex;
@@ -141,77 +142,80 @@ defineExpose({
     justify-content: space-around;
     align-items: center;
   } */
-h2 {
-  color: #fff;
-}
-
-p {
-  color: #fff;
-}
-
-.icon-red {
-  font-size: 100px;
-  color: #E43961;
-  animation: redstart 2s infinite;
-  /* position: relative; */
-  /* top: -15px; */
-}
-
-.icon-blue {
-  font-size: 100px;
-  color: #20AEC5;
-  /* position: relative; */
-  /* top: -15px; */
-}
-
-.iconsmall-size {
-  font-size: 20px;
-}
-
-.num {
-  font-size: 24px;
-}
-
-.unit {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  vertical-align: top;
-  font-size: 20px;
-  height: 5;
-  width: 100px;
-}
-
-.box>h2 {
-  font-size: 20px;
-}
-
-
-.icontip {
-  display: flex;
-  margin-top: -60px;
-  width: 100px;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: center;
-  height: 60px;
-}
-
-.icontipBox li {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  margin-bottom: 5px;
-}
-
-.icontipBox li p:nth-child(1) {
-  width: 40%;
-  text-align: left;
-}
-
-.icontipBox li p:nth-child(2) {
-  flex: 1;
-}
+  h2 {
+    color: #fff;
+  }
+  
+  p {
+    color: #fff;
+  }
+  
+  .icon-red {
+    font-size: 100px;
+    color: #E43961;
+    animation: redstart 2s infinite;
+    /* position: relative; */
+    /* top: -15px; */
+  }
+  
+  .icon-blue {
+    font-size: 100px;
+    color: #20AEC5;
+    /* position: relative; */
+    /* top: -15px; */
+  }
+  
+  .iconsmall-size {
+    font-size: 20px;
+  }
+  
+  .num {
+    font-size: 16px;
+  }
+  
+  .unit {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    vertical-align: top;
+    font-size: 16px;
+    height: 5;
+    width: 100px;
+  }
+  
+  .box>h2 {
+    font-size: 20px;
+    position: absolute;
+  top: 15px;
+  left:20px;
+  }
+  
+  
+  .icontip {
+    display: flex;
+    margin-top: -60px;
+    width: 100px;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: center;
+    height: 60px;
+  }
+  
+  .icontipBox li {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    margin-bottom: 5px;
+  }
+  
+  .icontipBox li p:nth-child(1) {
+    width: 40%;
+    text-align: left;
+  }
+  
+  .icontipBox li p:nth-child(2) {
+    flex: 1;
+  }
 
 @keyframes redstart {
   0% {}
diff --git a/src/views/PaintShopView/finishView/top.vue b/src/views/PaintShopView/finishView/top.vue
index 66fecbf..19d6dd1 100644
--- a/src/views/PaintShopView/finishView/top.vue
+++ b/src/views/PaintShopView/finishView/top.vue
@@ -286,7 +286,7 @@ let temp_humi_index = 0
     verticalNum4.value.setData(noise,'icon-shengyin',120,"dB")
     // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
     verticalNum6.value.setData(CH2O,'icon-app_icons--',0.08,"mg/m3")
-    verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"PPM")
+    verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"mg/m3")
     // console.log(pmref.value);
     humidityref.value.setData({ h: val.temp_humi[temp_humi_index].huim, c: val.temp_humi[temp_humi_index].temp })
   if (val.temp_humi.length > 1) {
diff --git a/src/views/PaintShopView/machiningView/top.vue b/src/views/PaintShopView/machiningView/top.vue
index c141d0d..3d62891 100644
--- a/src/views/PaintShopView/machiningView/top.vue
+++ b/src/views/PaintShopView/machiningView/top.vue
@@ -284,7 +284,7 @@ let temp_humi_index = 0
     verticalNum4.value.setData(noise,'icon-shengyin',120,"dB")
     // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
     verticalNum6.value.setData(CH2O,'icon-app_icons--',0.08,"mg/m3")
-    verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"PPM")
+    verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"mg/m3")
     // console.log(pmref.value);
     humidityref.value.setData({ h: val.temp_humi[temp_humi_index].huim, c: val.temp_humi[temp_humi_index].temp })
   if (val.temp_humi.length > 1) {