From 1cb094d9e4a16762a1e16cda334127dee45dadef Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Tue, 9 Jan 2024 17:06:41 +0800
Subject: [PATCH] update

---
 src/assets/css/iconfont/iconfont.css          |  19 ++++
 src/assets/css/iconfont/iconfont.ttf          | Bin 0 -> 1792 bytes
 src/assets/css/iconfont/iconfont.woff         | Bin 0 -> 1164 bytes
 src/assets/css/iconfont/iconfont.woff2        | Bin 0 -> 784 bytes
 .../child/station/components/float.vue        |  81 ++++++++++++------
 .../child/station/components/sum.vue          |  59 +++++++++----
 src/views/Mechanics/child/station/index.vue   |  35 +++++++-
 .../MicEnvironment/components/verticalNum.vue |   1 +
 src/views/MicEnvironment/index.vue            |  10 +--
 src/views/PaintShopView/View1/index.vue       |   8 +-
 src/views/PaintShopView/View1/top.vue         |   2 +-
 .../PaintShopView/components/verticalNum.vue  |   1 +
 src/views/PaintShopView/finishView/index.vue  |   8 +-
 src/views/PaintShopView/finishView/top.vue    |   2 +-
 .../PaintShopView/machiningView/index.vue     |   8 +-
 src/views/PaintShopView/machiningView/top.vue |   2 +-
 src/views/PaintShopView/stuffView/index.vue   |   8 +-
 src/views/PaintShopView/stuffView/top.vue     |   2 +-
 src/views/PaintShopView/weldView/index.vue    |   8 +-
 src/views/PaintShopView/weldView/top.vue      |   2 +-
 src/views/Temp/GetonAgain/index.vue           |   8 +-
 src/views/electronicControlAmbient/index.vue  |   8 +-
 .../environment/content/chart/verticalNum.vue |   2 +-
 src/views/environment/content/left.vue        |   2 +-
 .../components/power2023.vue                  |   2 +-
 .../components/verticalNumLoop.vue            |   2 +-
 .../generalEnvironmentMechanical/index.vue    |  12 +--
 .../content/chart/verticalNumLoop.vue         |   1 +
 .../realtimeSecurity/content/content.vue      |   2 +-
 src/views/realtimeSecurity/index.vue          |   8 +-
 .../content/chart/verticalNum.vue             |   1 +
 .../content/content.vue                       |   6 +-
 .../realtimeSecurityJixiefenchang/index.vue   |   8 +-
 33 files changed, 213 insertions(+), 105 deletions(-)
 create mode 100644 src/assets/css/iconfont/iconfont.css
 create mode 100644 src/assets/css/iconfont/iconfont.ttf
 create mode 100644 src/assets/css/iconfont/iconfont.woff
 create mode 100644 src/assets/css/iconfont/iconfont.woff2

diff --git a/src/assets/css/iconfont/iconfont.css b/src/assets/css/iconfont/iconfont.css
new file mode 100644
index 0000000..3e31ff9
--- /dev/null
+++ b/src/assets/css/iconfont/iconfont.css
@@ -0,0 +1,19 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 4404806 */
+  src: url('iconfont.woff2?t=1704785829971') format('woff2'),
+       url('iconfont.woff?t=1704785829971') format('woff'),
+       url('iconfont.ttf?t=1704785829971') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-tvoc:before {
+  content: "\e753";
+}
+
diff --git a/src/assets/css/iconfont/iconfont.ttf b/src/assets/css/iconfont/iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4c7790ca546ed48afd9e42c691cc0fe25a4ce987
GIT binary patch
literal 1792
zcmd^9&u<$=6#iy+y-pl#>^Q`UanWKY4uQ&X?Gjf}OC?H@3PlCQA*V|1)>+$$Y_GN1
zL=8wNQV$4$1QLHjB!1kGxKM;pijcT);KrpYAPzyI5*O$R8opVNQ)v1hFxI~L-uJ#Y
z^XBb%Api_v7dncI)z@CM-kE$I5NF7)yi%Phool|FqyH}btF^Y>{q>ETd-VU{(`~eN
z>aj8Jb3kt~{#Vnn*YbNG>=6INXSPWqd`G`Q{3V}>X4}6$K)~F)Gy^TSX5&ri>uWS-
z+rHiv30z@(jK0;e+fID%?5BXy1hhui-SoHK>aJ7zJ>vzic76A77ncpXR539C4~!Nt
zWY2uHv47?9vwvc!r~Ucsk0+(9KO4|WbO)fRWVw=tDnfxT*$98YVc_?6ilB%WpuM!P
zw1Qa6_B%++B7!0F|BXd!y<v0xUZ!A7Mg<uGQ?Z5t@xI(qdt3XC+<U!Q{DzWXriPGC
z_7UUN`urO952^>%pdZk0W0$i3c0-dJs*>cX<XR_tlvq*POJrr%NzObic>~!%!_t6*
z>LJhHv-Eo>fROe7-^XJ?12U=&L9b+|==a`&yywAP(r@vmg%M+43s?q{iCiN0eEErF
zPA{h_<)oRN%1`A_S7s}-rPOF@bR=v}<+EXPBsE&9%$^RJxd(!BDfN^{<)}XrRLU{2
zzcBa3XBRIm<?~DX89Ng<b={0-uAT_MeE8|`;Gi^OI6Ym=BtnJ}N@R-D=~!IMi;$T$
zBN3Vqow)e@{x9Oh`SY}w@7=rq&BVmWWO_S2InoC|#$v-C4##4NkM52i#m1x0j3)=8
zj3lGc!Qrv#pew_;qk6$ZAN5841Col@*q0|2*2!lTHi(~9IK;12Nnw-xIfWy54)Y2R
zamB8@$;Ke}$>WB?0&#qzu*NrVQ(>L_w+b7?KPVi+C=L`h$^Wfz1gj#d@DTE%cENLO
z-&wP+?O5wIw^MgJet%we8e1*f>%0AV)$umh-HvstQ0!BSPRH^3%WQ5pO1@vW>Ym%S
z7Py|%YPnX|b2prtUugP%cW!1z?j!j^&28fXJUFo7)2_k7HSEx?qXrip)C21u^Ovb^
zU<)l~ddH#<XRlK2VUs$!riD|y!o_1*i&S+2<-^r%Vw<~_SfkI1EIuArY7;G}`W#l$
yBDVMfWo(1%)Tl0?8Dw=ahZ+9*=jrPU!8zOVBiS4BTm7h^2~FrQ{B5@;!~Xz6y6$cO

literal 0
HcmV?d00001

diff --git a/src/assets/css/iconfont/iconfont.woff b/src/assets/css/iconfont/iconfont.woff
new file mode 100644
index 0000000000000000000000000000000000000000..5edbdff6f9986c4a21e0e6d663212fcae67683f8
GIT binary patch
literal 1164
zcmXT-cXMN4WB>w|9tLg@&CUSfgV?CRJvh_}D9Hg7wFcr4g>Ka<|6qM1pqLAg55fty
z8D7fCxrqfpu?`^L8%P(tsNT6aJ*P4a$i4y;yA8yD_#}#UWTYmhFfcG}0P=N#*i3El
z<jM@7AW-Z9kS_zoD(v@|n=^7tDu7~tfP9eM93UbmKN+ZwnFYvX1LHadhTOyopuNmI
zK)wP9GYT@q=OyN*0>yNIb~^ygNEcXav!NirxCH3m9H1ImAl55wFUYKzlbn!}knkYM
zAYnstLQ&yo&cp|&J#|hdPe@8gY+#sRV>H`P-Pm?wBl9ulQyUvH`4rNcJD3>MtXVx6
zKzb7s6XqN^aO%K;D<@0Z8XFhNI~ngwGe~;E&}Fp2$T)$OF>{?J5BofJd;YY%ANLO&
zI8f8h=wW2ANF#}fq4YB^2gr<sgj67AOOjPcOH4@MNlZv#V6<PLp&T)1W+S)GxkC$B
z!VWVD)yw_)Z{Nf6De`~{v$FJIjR%aAjRNE>)+o$q6lC}o#<dgdo>T^=XU#rtJa2ev
zc)WP3cpQ0n4mF)>I<@TBqC=<79DDTa*r6P+S6Q#J)Sjh1OLKda^e9Q`P0p(<uQxeL
zkCNP;rKzpSImN+x%<WN8&!baW9$aU7e@gK0h<tnN&BN!5mpv<XPz!Wx=$$#!*Fnuu
z>`Xywc*^r9EP_2wL9^J5n%3y(tZ6c0n-x^U)U&Q<O^#PiOpHU5=n27un*Z+&7q8iC
zJE7<2x3~8NMMVWeR~l)C3Q9b-lb?UVNYT#j;M07Sheeb2NKHB<v&TU)F)q$ek<*ur
zjp5NdO;fPnfbqnT)Lk3N{^)1!KBI!o1`P)eJ8Oqb%oJl&Q&u>7@BqsrMh4ku9G`)a
z3yoJ$m<t>}#K7b*X(FSj0V9Ju2U9jE@qjQG0MidR-7_%+Gq8e1n1Cb~5Hc|Q2lIhu
zwNA9nJLDkHI{)AVmMI!uOH4AuG&O`y{+Z&jGGM{-1?-!jxo^83rSEaY(zkDd@Dq-g
z8O2>5l{cK3UH9C&nSXEJOxcqR?>4lzf7<<A@8)6E&6Biu99Ud1_1EML{&iyO7Iw}n
znEPvW0keLEaNefmV|?@KkFIGgPvqbJLtxzlw)uxbU&SA?`x(8Xjr|YD^_Bm*%nd%S
zYn`1@`S8H2m6wZ6Z?6o^xO8I4yNbTANy7ebSK3@Oi=P=%+I%ih>Sf67<k>a5Us#H-
zJTc3Kw{rF48!OJt+R7KZp+xWX_S+L*IA#d(BrG&+O`hYN*e3g!OOYqY#kC~;=Ztr(
zW*w24|4aQ}Y&)@1zNl4?spMRY@~%sVDy@9`bmLzKmX>Jeou1WVG9~J)XVRue{5E&i
zu57u&tkb=Ur*_NEMZ)y~XD0k%yfHaH926Hx4Gem0ZyGu$c21nxxO9n*{me#22CgK=
IYrr4|0HE)z-2eap

literal 0
HcmV?d00001

diff --git a/src/assets/css/iconfont/iconfont.woff2 b/src/assets/css/iconfont/iconfont.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..afa9060a4ec0105296870616154a6bd1fc76d8f9
GIT binary patch
literal 784
zcmV+r1MmEIPew8T0RR9100R&J3jhEB00#g700O}P0RR9100000000000000000000
z0000SR0d!Gf^Z6fe1T{IHUcCA2nz-P1Rw>3X9q4DA_m9~B~8J=nBjp5L_B<rrSI?V
z(O!Vr$3=%*)>V-;rm7uZWdMz5g+|<bcKH*?6Y11Nz-Dju;JJyqy_fE;irmSa(Z|09
z;M1SVS%eRSl2SVMptbRX)wc$;V@xYnu-Ee<_c1nU_Gw<NX9TJv$&Amk3oC*B9YvJD
zn<=k3C^O?uBBFq$>QfX*wuL5kX%Vk9NH5Y2;AQ&x_)id)B#q3=xqOx-1P3oG{1KV$
zvE;AV?P_3nLIW9l7c<1|xb2)t9@}H0_SsCW2$e<fyQ0^N4dT*Tq5O4TdLNhro=!q2
zqiRV41>O5^08baamqxoaW*gFAY@KU#J*xFKRW&wsOM1?j|Cr8a+Go`eJL)&edQMai
z>0L)yuR(*yxQ?2$)*mbkPKsW&F>DV`dRdQ6kS&LOY(`%1fAGupi%;1~+3?LRYA6i-
z?k_FePuQe3zg9+eL{@&?Y(38NGG8c`6}lN+d@Vcc^mZhYw`r0Y*AbU#vUwCa^7ONv
zWt`I()YLoEM@k!Wjj}9$N#zCdmn8Vjzp?dEdeAbM_}$W`fL}**p{b_8Ie<1jY{5^J
zKSdIY?I)E!K}{t$%;;HBRrGkS5igdiMk${PZKGUpw9J;s+E%E-?VzFS1Wj$HsCH$o
z?i!_LB1#7vdI-Xhc_ahgARBT{748-d6JDZe$bVG#!*08-ji56yq6iYgwr(h)RZ1pM
zl2mFr61B@I+!d}ySSx`b<a2n<WDZgyyv7V|he$vO0~xGRz-;+6B$un88mpv;CLA##
z>Ub`f>3a!>Rw+OR451K+5Y(m{BtcVAVq!9>e_uI7q@5fEBdO{brX>OC5FZB*LFI@_
zRKttxqSZk}fFKwU1CxXTl&xA2xfN4^)cu2`5E{WDUJy}>$Ms1JR^%M7P<+}Js62HF
Ozc4G$J5)3P0000AJ5s;^

literal 0
HcmV?d00001

diff --git a/src/views/Mechanics/child/station/components/float.vue b/src/views/Mechanics/child/station/components/float.vue
index 67b3f6e..851dac4 100644
--- a/src/views/Mechanics/child/station/components/float.vue
+++ b/src/views/Mechanics/child/station/components/float.vue
@@ -11,62 +11,68 @@
     <div class="floating1" id="floating">
       <div class="roate">
         <div class="roate-item" id="roate-item">
-          <span class="data">{{ allData.data1 }}%</span>
+          <span class="data">{{ props.allData.data1 }}%</span>
         </div>
       </div>
-      <p class="title">{{ allData.title1 }}</p>
+      <p class="title">{{ props.allData.title1 }}</p>
     </div>
 
     <div class="floating2" id="floating">
       <div class="roate">
         <div class="roate-item2" id="roate-item">
-          <span class="data" :style="getData2Style(allData.data2)"
-            >{{
-              allData.data2 === "N1"
-                ? "工作"
-                : allData.data2 === "N2"
-                ? "待机"
-                : allData.data2 === "N3"
+          <span class="data" :style="getData2Style(props.allData.data2)">{{
+            props.allData.data2 === "N1"
+            ? "工作"
+            : props.allData.data2 === "N2"
+              ? "待机"
+              : props.allData.data2 === "N3"
                 ? "停机"
                 : "未知状态"
-            }}
+          }}
           </span>
         </div>
       </div>
-      <p class="title">{{ allData.title2 }}</p>
+      <p class="title">{{ props.allData.title2 }}</p>
     </div>
 
     <div class="floating3" id="floating">
       <div class="roate">
         <div class="roate-item3" id="roate-item">
-          <span class="data">{{ allData.data3 }}转</span>
+          <span class="data">{{ props.allData.data3 }}转</span>
         </div>
       </div>
-      <p class="title">{{ allData.title3 }}</p>
+      <p class="title">{{ props.allData.title3 }}</p>
     </div>
 
     <div class="floating4" id="floating">
       <div class="roate">
         <div class="roate-item4" id="roate-item">
-          <span class="data" style="margin: 20px 15px 0 0">{{ allData.data4 }}</span>
+          <span class="data" style="margin: 20px 15px 0 0">{{ props.allData.data4 }}</span>
         </div>
       </div>
-      <p class="title">{{ allData.title4 }}</p>
+      <p class="title">{{ props.allData.title4 }}</p>
     </div>
   </div>
 </template>
 <script setup lang="ts">
 import { ref, getCurrentInstance, reactive, onMounted, computed } from "vue";
-let allData = reactive({
-  data1: "95",
-  data2: "N3",
-  data3: "100",
-  data4: "下降",
-  title1: "稼动率",
-  title2: "设备状态",
-  title3: "钻头转速",
-  title4: "钻头状态",
-});
+const props = defineProps({
+  allData: {
+    type: Object,
+    default: () => {
+      return {
+        data1: "95",
+        data2: "N1",
+        data3: "100",
+        data4: "下降",
+        title1: "稼动率",
+        title2: "设备状态",
+        title3: "钻头转速",
+        title4: "钻头状态",
+      };
+    },
+  },
+}); // 定义props
 const getData2Style = (data2Value: string) => {
   switch (data2Value) {
     case "N1":
@@ -95,11 +101,13 @@ const getData2Style = (data2Value: string) => {
   animation: float 5s linear infinite;
   position: relative;
 }
+
 .roate-item {
   bottom: 70%;
   background: url(./../img/j1.png) no-repeat center;
   animation: roate 6s linear infinite;
 }
+
 .floating2 {
   top: -30%;
   left: 25%;
@@ -107,11 +115,13 @@ const getData2Style = (data2Value: string) => {
   animation: float2 6s linear infinite;
   position: relative;
 }
+
 .roate-item2 {
   bottom: 80%;
   background: url(./../img/j2.png) no-repeat center;
   animation: roate 7s linear infinite;
 }
+
 .floating3 {
   bottom: 90%;
   left: 60%;
@@ -119,11 +129,13 @@ const getData2Style = (data2Value: string) => {
   animation: float2 6s linear infinite;
   position: relative;
 }
+
 .roate-item3 {
   bottom: 70%;
   background: url(./../img/j3.png) no-repeat center;
   animation: roate 7s linear infinite;
 }
+
 .floating4 {
   bottom: 150%;
   left: 80%;
@@ -131,6 +143,7 @@ const getData2Style = (data2Value: string) => {
   animation: float3 5s linear infinite;
   position: relative;
 }
+
 .roate-item4 {
   bottom: 90%;
   background: url(./../img/j4.png) no-repeat center;
@@ -145,6 +158,7 @@ const getData2Style = (data2Value: string) => {
   position: relative;
   background: url(./../img/j.png) no-repeat center;
 }
+
 #roate-item {
   width: 100%;
   right: 5px;
@@ -155,11 +169,13 @@ const getData2Style = (data2Value: string) => {
   justify-content: center;
   align-items: center;
 }
+
 .data {
   margin: 20px 0 0 10px;
   font-size: 28px;
   font-weight: 700;
 }
+
 .title {
   bottom: 18%;
   text-align: center;
@@ -167,39 +183,49 @@ const getData2Style = (data2Value: string) => {
   font-weight: 700;
   position: relative;
 }
+
 .float {
   width: 100%;
   height: 40%;
 }
+
 @keyframes float {
   0% {
     transform: translateY(0%);
   }
+
   50% {
     transform: translateY(40%);
   }
+
   100% {
     transform: translateY(0%);
   }
 }
+
 @keyframes float2 {
   0% {
     transform: translateY(0%);
   }
+
   50% {
     transform: translateY(50%);
   }
+
   100% {
     transform: translateY(0%);
   }
 }
+
 @keyframes roate {
   0% {
     transform: translateY(0%);
   }
+
   50% {
     transform: translateY(65%);
   }
+
   100% {
     transform: translateY(0%);
   }
@@ -209,20 +235,25 @@ const getData2Style = (data2Value: string) => {
   0% {
     transform: translateY(0%);
   }
+
   50% {
     transform: translateY(50%);
   }
+
   100% {
     transform: translateY(0%);
   }
 }
+
 @keyframes roate2 {
   0% {
     transform: translateY(0%);
   }
+
   50% {
     transform: translateY(70%);
   }
+
   100% {
     transform: translateY(0%);
   }
diff --git a/src/views/Mechanics/child/station/components/sum.vue b/src/views/Mechanics/child/station/components/sum.vue
index 63ad856..2d3c8ac 100644
--- a/src/views/Mechanics/child/station/components/sum.vue
+++ b/src/views/Mechanics/child/station/components/sum.vue
@@ -10,7 +10,7 @@
   <div class="sum">
     <div class="deviceimg">
       <!-- <img class="img" :src="allData.image" /> -->
-      <img class="img" src="./../img/device.png " />
+      <img class="img" :src="allData.image" />
     </div>
     <div class="cicle1"></div>
     <div class="data1" id="data">
@@ -21,7 +21,8 @@
     </div>
     <div class="data2" id="data">
       <div class="qiu2" id="qiu">
-        <p>{{ allData.data2 }}<p style="padding-left:20%">{{ allData.data2s }}</p></p>
+        <p>{{ allData.data2 }}</p>
+        <p>{{ allData.data2s }}</p>
       </div>
       <span>{{ allData.title2 }}</span>
     </div>
@@ -52,19 +53,41 @@
 <script setup lang="ts">
 import { ref, getCurrentInstance, reactive, onMounted } from "vue";
 import { imgurlAddXhr } from "@/utils/devSever";
-let allData = reactive({
-  data1: "高速",
-  data2: "50cm",
-  data2s: "2cm/s",
-  data3: "正转",
-  data4: "50cm",
-  data5: "50cm",
-  title1: "设备状态",
-  title2: "平台X轴距原点位置和速度",
-  title3: "设备状态",
-  title4: "平台y轴距原点位置",
-  title5: "平台z轴距原点位置",
-  image: "",
+// let allData = reactive({
+//   data1: "高速",
+//   data2: "50cm",
+//   data2s: "2cm/s",
+//   data3: "正转",
+//   data4: "50cm",
+//   data5: "50cm",
+//   title1: "设备状态",
+//   title2: "平台X轴距原点位置和速度",
+//   title3: "设备状态",
+//   title4: "平台y轴距原点位置",
+//   title5: "平台z轴距原点位置",
+//   image: "",
+// });
+
+const props = defineProps({
+  allData: {
+    type: Object,
+    default: () => {
+      return {
+        data1: "",
+        data2: "",
+        data2s: "",
+        data3: "",
+        data4: "",
+        data5: "",
+        title1: "",
+        title2: "",
+        title3: "",
+        title4: "",
+        title5: "",
+        image: "",
+      };
+    },
+  },
 });
 const { proxy } = getCurrentInstance() as any;
 </script>
@@ -128,6 +151,7 @@ img {
 }
 .qiu2 {
   background: url(./../img/cicle03.png) no-repeat center;
+  
 }
 
 .data3 {
@@ -174,7 +198,10 @@ p {
   background-size: 100%;
   top: 20%;
   margin: auto;
-  display: table;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
 }
 #qiu::before {
   content: "";
diff --git a/src/views/Mechanics/child/station/index.vue b/src/views/Mechanics/child/station/index.vue
index 65d8b38..22bafa6 100644
--- a/src/views/Mechanics/child/station/index.vue
+++ b/src/views/Mechanics/child/station/index.vue
@@ -15,8 +15,8 @@
       <div class="date">
         <p class="date-time">{{ timeHtml }}</p>
       </div>
-      <Float></Float>
-      <Sum></Sum>
+      <Float :allData="topData"></Float>
+      <Sum :allData="sumData"></Sum>
     </div>
   </div>
 </template>
@@ -31,6 +31,31 @@ let { timeHtml } = useNowTime();
 let allData = reactive({
   header: "炮塔铣床",
 });
+
+let topData = reactive({
+  data1: "95",
+  data2: "N1",
+  data3: "100",
+  data4: "下降",
+  title1: "稼动率",
+  title2: "设备状态",
+  title3: "钻头转速",
+  title4: "钻头状态",
+});
+let sumData = reactive({
+  data1: "高速",
+  data2: "50cm",
+  data2s: "2cm/s",
+  data3: "正转",
+  data4: "50cm",
+  data5: "50cm",
+  title1: "设备状态",
+  title2: "平台X轴距原点位置和速度",
+  title3: "设备状态",
+  title4: "平台y轴距原点位置",
+  title5: "平台z轴距原点位置",
+  image: "./../img/device.png",
+});
 </script>
 <style scoped>
 .container {
@@ -38,6 +63,7 @@ let allData = reactive({
   width: 1920px;
   position: relative;
 }
+
 .bj {
   width: 100%;
   height: 100%;
@@ -47,6 +73,7 @@ let allData = reactive({
   background-size: cover;
   background-position: center center;
   color: #aeeefa;
+
   .text {
     position: absolute;
     top: 25px;
@@ -58,6 +85,7 @@ let allData = reactive({
     font-family: "华文新魏", sans-serif;
   }
 }
+
 .date {
   font-size: 28px;
   height: 6%;
@@ -68,5 +96,4 @@ let allData = reactive({
 
 .date-time {
   margin-right: 125px;
-}
-</style>
+}</style>
diff --git a/src/views/MicEnvironment/components/verticalNum.vue b/src/views/MicEnvironment/components/verticalNum.vue
index 4038324..f18b3da 100644
--- a/src/views/MicEnvironment/components/verticalNum.vue
+++ b/src/views/MicEnvironment/components/verticalNum.vue
@@ -77,6 +77,7 @@ onUnmounted(() => {
   
 <style scoped>
 @import "@/assets/css/iconfont.css";
+@import "@/assets/css/iconfont/iconfont.css";
 
 
 .box {
diff --git a/src/views/MicEnvironment/index.vue b/src/views/MicEnvironment/index.vue
index f7649c0..87bf9e6 100644
--- a/src/views/MicEnvironment/index.vue
+++ b/src/views/MicEnvironment/index.vue
@@ -45,12 +45,12 @@ const store = useSocketStore();
 
 let titleTip = [
     {
-        color: "#E43961",
-        name: t('messages.abnormal'),
+        color: "#20AEC5",
+        name: t('messages.normal_Tip'),
     },
     {
-        color: "#20AEC5",
-        name: t('messages.NoAbnormal'),
+        color: "#E43961",
+        name: t('messages.abnormal'),
     },
     {
         color: "#A7A6BD",
@@ -62,7 +62,7 @@ const sensor_config: any = {
     'Noise_Reg': { 'icon': 'icon-shengyin', 'unit': 'dB', 'quota': 80, 'name': '噪声监测传感器', 'type': 'noise' },
     'Smoke_Reg': { 'icon': 'icon-yanwubaojingqi', 'unit': 'ppm', 'quota': 100, 'name': '烟雾监测传感器', 'type': 'smoke' },
     'CH2O': { 'icon': 'icon-app_icons--', 'unit': 'mg/m³', 'quota': 0.08, 'name': '甲醛监测传感器', 'type': 'CH2O' },
-    'TVOC': { 'icon': 'icon-TVOC-Outlined', 'unit': 'mg/m³', 'quota': 0.5, 'name': 'TVOC监测传感器', 'type': 'TVOC' },
+    'TVOC': { 'icon': 'icon-tvoc', 'unit': 'mg/m³', 'quota': 0.5, 'name': 'TVOC监测传感器', 'type': 'TVOC' },
     'Methane_Reg': { 'icon': 'icon-ranqi', 'unit': '', 'quota': 0, 'name': '燃气监测传感器', 'type': 'Gas' },
 }
 let width = ref(1500)
diff --git a/src/views/PaintShopView/View1/index.vue b/src/views/PaintShopView/View1/index.vue
index 3b9d4e6..46390bb 100644
--- a/src/views/PaintShopView/View1/index.vue
+++ b/src/views/PaintShopView/View1/index.vue
@@ -52,12 +52,12 @@ let size = reactive({
 });
 let titleTip = [
   {
-    color: "#E43961",
-    name: t('messages.abnormal'),
+    color: "#20AEC5",
+    name: t('messages.normal_Tip'),
   },
   {
-    color: "#20AEC5",
-    name: t('messages.NoAbnormal'),
+    color: "#E43961",
+    name: t('messages.abnormal'),
   },
   {
     color: "#A7A6BD",
diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue
index 9e44e29..dda774f 100644
--- a/src/views/PaintShopView/View1/top.vue
+++ b/src/views/PaintShopView/View1/top.vue
@@ -271,7 +271,7 @@ function setcontentData(val) {
   verticalNum4.value.setData(noise, 'icon-shengyin', 85, "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")
+  verticalNum7.value.setData(TVOC, 'icon-tvoc', 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 })
diff --git a/src/views/PaintShopView/components/verticalNum.vue b/src/views/PaintShopView/components/verticalNum.vue
index eb0b005..7293916 100644
--- a/src/views/PaintShopView/components/verticalNum.vue
+++ b/src/views/PaintShopView/components/verticalNum.vue
@@ -130,6 +130,7 @@ defineExpose({
   
 <style scoped>
 @import "@/assets/css/iconfont.css";
+@import "@/assets/css/iconfont/iconfont.css";
 
 
 .box {
diff --git a/src/views/PaintShopView/finishView/index.vue b/src/views/PaintShopView/finishView/index.vue
index 565a286..5b90b62 100644
--- a/src/views/PaintShopView/finishView/index.vue
+++ b/src/views/PaintShopView/finishView/index.vue
@@ -81,12 +81,12 @@ let size = reactive({
 });
 let titleTip = [
   {
-    color: "#E43961",
-    name: t('messages.abnormal'),
+    color: "#20AEC5",
+    name: t('messages.normal_Tip'),
   },
   {
-    color: "#20AEC5",
-    name: t('messages.NoAbnormal'),
+    color: "#E43961",
+    name: t('messages.abnormal'),
   },
   {
     color: "#A7A6BD",
diff --git a/src/views/PaintShopView/finishView/top.vue b/src/views/PaintShopView/finishView/top.vue
index e9bee6c..fbbc2ed 100644
--- a/src/views/PaintShopView/finishView/top.vue
+++ b/src/views/PaintShopView/finishView/top.vue
@@ -284,7 +284,7 @@ let temp_humi_index = 0
     verticalNum4.value.setData(noise,'icon-shengyin',85,"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,"mg/m3")
+    verticalNum7.value.setData(TVOC,'icon-tvoc',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/index.vue b/src/views/PaintShopView/machiningView/index.vue
index beb3a94..f51e283 100644
--- a/src/views/PaintShopView/machiningView/index.vue
+++ b/src/views/PaintShopView/machiningView/index.vue
@@ -81,12 +81,12 @@ let size = reactive({
 });
 let titleTip = [
   {
-    color: "#E43961",
-    name: t('messages.abnormal'),
+    color: "#20AEC5",
+    name: t('messages.normal_Tip'),
   },
   {
-    color: "#20AEC5",
-    name: t('messages.NoAbnormal'),
+    color: "#E43961",
+    name: t('messages.abnormal'),
   },
   {
     color: "#A7A6BD",
diff --git a/src/views/PaintShopView/machiningView/top.vue b/src/views/PaintShopView/machiningView/top.vue
index fb2a089..910ea0c 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',85,"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,"mg/m3")
+    verticalNum7.value.setData(TVOC,'icon-tvoc',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/stuffView/index.vue b/src/views/PaintShopView/stuffView/index.vue
index cf40ca1..cb1e87c 100644
--- a/src/views/PaintShopView/stuffView/index.vue
+++ b/src/views/PaintShopView/stuffView/index.vue
@@ -57,12 +57,12 @@ let {t} = useI18n();
      });
      let titleTip = [
   {
-    color: "#E43961",
-    name: t('messages.abnormal'),
+    color: "#20AEC5",
+    name: t('messages.normal_Tip'),
   },
   {
-    color: "#20AEC5",
-    name: t('messages.NoAbnormal'),
+    color: "#E43961",
+    name: t('messages.abnormal'),
   },
   {
     color: "#A7A6BD",
diff --git a/src/views/PaintShopView/stuffView/top.vue b/src/views/PaintShopView/stuffView/top.vue
index 98ea596..15ad37b 100644
--- a/src/views/PaintShopView/stuffView/top.vue
+++ b/src/views/PaintShopView/stuffView/top.vue
@@ -284,7 +284,7 @@ function setcontentData(val) {
   verticalNum4.value.setData(noise, 'icon-shengyin', 85, "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, "mg/m3")
+  verticalNum7.value.setData(TVOC, 'icon-tvoc', 0.5, "mg/m3")
   
   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/weldView/index.vue b/src/views/PaintShopView/weldView/index.vue
index c3c2941..9a0def5 100644
--- a/src/views/PaintShopView/weldView/index.vue
+++ b/src/views/PaintShopView/weldView/index.vue
@@ -50,12 +50,12 @@ let {t} = useI18n();
      });
      let titleTip = [
   {
-    color: "#E43961",
-    name: t('messages.abnormal'),
+    color: "#20AEC5",
+    name: t('messages.normal_Tip'),
   },
   {
-    color: "#20AEC5",
-    name: t('messages.NoAbnormal'),
+    color: "#E43961",
+    name: t('messages.abnormal'),
   },
   {
     color: "#A7A6BD",
diff --git a/src/views/PaintShopView/weldView/top.vue b/src/views/PaintShopView/weldView/top.vue
index 08d5c49..f0882bb 100644
--- a/src/views/PaintShopView/weldView/top.vue
+++ b/src/views/PaintShopView/weldView/top.vue
@@ -283,7 +283,7 @@ function setcontentData(val) {
   verticalNum4.value.setData(noise, 'icon-shengyin', 85, "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, "mg/m3")
+  verticalNum7.value.setData(TVOC, 'icon-tvoc', 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/Temp/GetonAgain/index.vue b/src/views/Temp/GetonAgain/index.vue
index a0724ca..7fb1d7e 100644
--- a/src/views/Temp/GetonAgain/index.vue
+++ b/src/views/Temp/GetonAgain/index.vue
@@ -71,12 +71,12 @@ import { useI18n } from "vue-i18n";
 let { t } = useI18n();
 let titleTip = [
   {
-    color: "#E43961",
-    name: t("messages.abnormal"),
+    color: "#20AEC5",
+    name: t("messages.normal_Tip"),
   },
   {
-    color: "#20AEC5",
-    name: t("messages.NoAbnormal"),
+    color: "#E43961",
+    name: t("messages.abnormal"),
   },
   {
     color: "#A7A6BD",
diff --git a/src/views/electronicControlAmbient/index.vue b/src/views/electronicControlAmbient/index.vue
index 07b4ce6..a4bf2ac 100644
--- a/src/views/electronicControlAmbient/index.vue
+++ b/src/views/electronicControlAmbient/index.vue
@@ -81,12 +81,12 @@ let size = reactive({
 });
 let titleTip = [
   {
-    color: "#E43961",
-    name: t('messages.abnormal'),
+    color: "#20AEC5",
+    name: t('messages.normal_Tip'),
   },
   {
-    color: "#20AEC5",
-    name: t('messages.NoAbnormal'),
+    color: "#E43961",
+    name: t('messages.abnormal'),
   },
   {
     color: "#A7A6BD",
diff --git a/src/views/environment/content/chart/verticalNum.vue b/src/views/environment/content/chart/verticalNum.vue
index d880eaf..b645464 100644
--- a/src/views/environment/content/chart/verticalNum.vue
+++ b/src/views/environment/content/chart/verticalNum.vue
@@ -41,7 +41,7 @@ onMounted(() => {
 </style>
 <style scoped>
 @import '@/assets/css/iconfont.css';
-
+@import "@/assets/css/iconfont/iconfont.css";
 .box {
   height: 100%;
   width: 100%;
diff --git a/src/views/environment/content/left.vue b/src/views/environment/content/left.vue
index a47bf2f..c1030ff 100644
--- a/src/views/environment/content/left.vue
+++ b/src/views/environment/content/left.vue
@@ -23,7 +23,7 @@
         <border2 ref="ReffinishAir">
                <template v-slot>
                    <div class="content-LR" ref="finishAir">
-                    <verticalNum :title="`${t('messages.JingShiRoom')}TVOC（mg/m3）`" :data="0.1" :unit="'mg/m3'" :quota="1" :iconname="'icon-TVOC-Outlined'"></verticalNum>
+                    <verticalNum :title="`${t('messages.JingShiRoom')}TVOC（mg/m3）`" :data="0.1" :unit="'mg/m3'" :quota="1" :iconname="'icon-tvoc'"></verticalNum>
                    </div>
                </template>
            </border2>
diff --git a/src/views/generalEnvironmentMechanical/components/power2023.vue b/src/views/generalEnvironmentMechanical/components/power2023.vue
index fd32e2a..fb064c7 100644
--- a/src/views/generalEnvironmentMechanical/components/power2023.vue
+++ b/src/views/generalEnvironmentMechanical/components/power2023.vue
@@ -40,7 +40,7 @@ const initEchart = () => {
     
     let series = [];
     props.httpValue.listData.forEach((res) => {
-      if (res.years == 2023) {
+      if (res.years == 2024) {
         for (let key in res.month) {
           series.push({
             name: key + "月",
diff --git a/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue b/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue
index e8173f8..aa18fd0 100644
--- a/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue
+++ b/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue
@@ -113,7 +113,7 @@ const boxSize = reactive({
 
 <style scoped>
 @import "@/assets/css/iconfont.css";
-
+@import "@/assets/css/iconfont/iconfont.css";
 .box {
   height: 50%;
   width: 100%;
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index 3fffbb7..23eb0b0 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -83,12 +83,12 @@ let deptIds = '6,7,9,10,11'
 document.title = t('messages.环境 实时监测系统')
 let titleTip = [
     {
-        color: "#E43961",
-        name: t('messages.abnormal'),
+        color: "#20AEC5",
+        name: t('messages.normal_Tip'),
     },
     {
-        color: "#20AEC5",
-        name: t('messages.NoAbnormal'),
+        color: "#E43961",
+        name: t('messages.abnormal'),
     },
     {
         color: "#A7A6BD",
@@ -96,7 +96,7 @@ let titleTip = [
     },
 ];
 const verticalType = {
-    'TVOC': { icon: 'icon-TVOC-Outlined', title: t('messages.TVOCDetection'), unit: 'mg/m³' },
+    'TVOC': { icon: 'icon-tvoc', title: t('messages.TVOCDetection'), unit: 'mg/m³' },
     'Smoke': { icon: 'icon-yanwubaojingqi', title: t('messages.smokeDetection'), unit: "ppm" },
     'Methane': { icon: 'icon-ranqi', title: t('messages.gasDetection'), unit: null },
     'CH2O': { icon: 'icon-app_icons--', title: t('messages.CH2ODetection'), unit: 'mg/m³' },
@@ -263,7 +263,7 @@ async function getPower_data() {
     if (result.code == 200) {
         let series = [];
         result.data.listData.forEach((res) => {
-            if (res.years == 2023) {
+            if (res.years == 2024) {
                 for (let key in res.month) {
                     series.push({
                         name: key + "月",
diff --git a/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue b/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue
index 6d94fcb..fad8506 100644
--- a/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue
+++ b/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue
@@ -109,6 +109,7 @@ const boxSize = reactive({
 
 <style scoped>
 @import "@/assets/css/iconfont.css";
+@import "@/assets/css/iconfont/iconfont.css";
 
 .box {
   height: 50%;
diff --git a/src/views/realtimeSecurity/content/content.vue b/src/views/realtimeSecurity/content/content.vue
index 531740a..1544bc4 100644
--- a/src/views/realtimeSecurity/content/content.vue
+++ b/src/views/realtimeSecurity/content/content.vue
@@ -61,7 +61,7 @@ let perssure2 = ref()
 let pipe1 = ref()
 
 const verticalType = {
-  'TVOC': { icon: 'icon-TVOC-Outlined', title: t('messages.TVOCDetection'), unit: 'mg/m³' },
+  'TVOC': { icon: 'icon-tvoc', title: t('messages.TVOCDetection'), unit: 'mg/m³' },
   'Smoke': { icon: 'icon-yanwubaojingqi', title: t('messages.smokeDetection'), unit: "ppm" },
   'Methane': { icon: 'icon-ranqi', title: t('messages.gasDetection'), unit: null },
   'CH2O': { icon: 'icon-app_icons--', title: t('messages.CH2ODetection'), unit: 'mg/m³' },
diff --git a/src/views/realtimeSecurity/index.vue b/src/views/realtimeSecurity/index.vue
index 24882b6..8c52eb1 100644
--- a/src/views/realtimeSecurity/index.vue
+++ b/src/views/realtimeSecurity/index.vue
@@ -44,12 +44,12 @@ import { useI18n } from 'vue-i18n'
 let {t} = useI18n();
 let titleTip = [
   {
-    color: "#E43961",
-    name: t('messages.abnormal'),
+    color: "#20AEC5",
+    name: t('messages.normal_Tip'),
   },
   {
-    color: "#20AEC5",
-    name: t('messages.NoAbnormal'),
+    color: "#E43961",
+    name: t('messages.abnormal'),
   },
   {
     color: "#A7A6BD",
diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
index c8407f9..e0405ba 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
@@ -154,6 +154,7 @@ defineExpose({
 
 <style scoped>
 @import "@/assets/css/iconfont.css";
+@import "@/assets/css/iconfont/iconfont.css";
 .container {
   width: 100%;
   height: 100%;
diff --git a/src/views/realtimeSecurityJixiefenchang/content/content.vue b/src/views/realtimeSecurityJixiefenchang/content/content.vue
index fc6c6ab..6d63e05 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/content.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/content.vue
@@ -103,7 +103,7 @@ watch(
     newVal.forEach((item: any, index: number) => {
       if (item.value != oldVal[index].value) {
         if (item.type == 'TVOC') {
-          verticalNum7.value.setData(item.value, 'icon-TVOC-Outlined', item.limit, "mg/m3")
+          verticalNum7.value.setData(item.value, 'icon-tvoc', item.limit, "mg/m3")
         }
         if (item.type == 'Smoke') {
           verticalNum5.value.setData(item.value, 'icon-yanwubaojingqi', item.limit, "")
@@ -124,7 +124,7 @@ watch(
   { deep: true, flush: "post" }
 )
 const verticalType = {
-  'TVOC': { icon: 'icon-TVOC-Outlined', title: t('messages.TVOCDetection'), unit: 'mg/m³' },
+  'TVOC': { icon: 'icon-tvoc', title: t('messages.TVOCDetection'), unit: 'mg/m³' },
   'Smoke': { icon: 'icon-yanwubaojingqi', title: t('messages.smokeDetection'), unit: null },
   'Methane': { icon: 'icon-ranqi', title: t('messages.gasDetection'), unit: null },
   'CH2O': { icon: 'icon-app_icons--', title: t('messages.CH2ODetection'), unit: 'mg/m³' },
@@ -169,7 +169,7 @@ async function getSafeWarningDatafun() {
 
     handle_vertical.forEach(res => {
       if (res.type == 'TVOC') {
-        verticalNum7.value.setData(res.value, 'icon-TVOC-Outlined', res.limit, "mg/m3")
+        verticalNum7.value.setData(res.value, 'icon-tvoc', res.limit, "mg/m3")
       }
       if (res.type == 'Smoke') {
         verticalNum5.value.setData(res.value, 'icon-yanwubaojingqi', res.limit, "")
diff --git a/src/views/realtimeSecurityJixiefenchang/index.vue b/src/views/realtimeSecurityJixiefenchang/index.vue
index 06d688e..599ce9f 100644
--- a/src/views/realtimeSecurityJixiefenchang/index.vue
+++ b/src/views/realtimeSecurityJixiefenchang/index.vue
@@ -44,12 +44,12 @@ let headerref=ref()
 let time = ref(null);
 let titleTip = [
   {
-    color: "#E43961",
-    name: t('messages.abnormal'),
+    color: "#20AEC5",
+    name: t('messages.normal_Tip'),
   },
   {
-    color: "#20AEC5",
-    name: t('messages.NoAbnormal'),
+    color: "#E43961",
+    name: t('messages.abnormal'),
   },
   {
     color: "#A7A6BD",