From ad162ad03bfbf367ab49aa10dc4ab31d6587b732 Mon Sep 17 00:00:00 2001
From: yjl <1490736767@qq.com>
Date: Fri, 21 Oct 2022 17:21:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BB=BA?=
 =?UTF-8?q?=E5=9B=9B=E5=B1=80=E9=A1=B5=E9=9D=A2=EF=BC=88=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E5=8F=8C=E7=A2=B3=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=89=E5=8D=95=E4=BD=8D=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectAdmin/fourEngin/carbon/leftBottom.vue     |  4 ++--
 .../projectAdmin/fourEngin/carbon/leftCenter.vue     |  2 +-
 src/views/projectAdmin/fourEngin/carbon/leftTop.vue  |  6 ++++--
 .../projectAdmin/fourEngin/carbon/rightCenter.vue    | 12 ++++++------
 src/views/projectAdmin/fourEngin/carbon/rightTop.vue |  4 ++--
 .../projectAdmin/fourEngin/quality/leftMiddle.vue    |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/views/projectAdmin/fourEngin/carbon/leftBottom.vue b/src/views/projectAdmin/fourEngin/carbon/leftBottom.vue
index f8670a1a..9ca1f48b 100644
--- a/src/views/projectAdmin/fourEngin/carbon/leftBottom.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/leftBottom.vue
@@ -6,12 +6,12 @@
     <span class="numTop" >
       <span class="numText">10</span>
       </span>
-    <span class="texts">度</span>
+    <span class="texts">kwh</span>
    </div>
     <div class="electricityBottom">
      <span class="text">历史发电量</span>
     <span class="numTop"><span class="numText">126</span></span>
-    <span class="texts">度</span>
+    <span class="texts">kwh</span>
    </div>
     </div>
     
diff --git a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
index 47d06dfa..4040a4c2 100644
--- a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
@@ -18,7 +18,7 @@
                 <td>一号设备</td>
                 <td>离线</td>
                 <td>pm2.5</td>
-                <td>0.1mg/m3</td>
+                <td>μg/m3</td>
                 <td>2次</td>
               </tr>
             </tbody>
diff --git a/src/views/projectAdmin/fourEngin/carbon/leftTop.vue b/src/views/projectAdmin/fourEngin/carbon/leftTop.vue
index 90c14de6..2d045fd3 100644
--- a/src/views/projectAdmin/fourEngin/carbon/leftTop.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/leftTop.vue
@@ -21,8 +21,8 @@
         <div class="text">
           <p class="ps">环境巡检率/环境总数</p>
           <p style="color:#d7d9dc;font-size:18px" class="pstest">
-            <span style="color:#72bdc9;">36</span>
-            /200
+            <span style="color:#72bdc9;">80</span>
+            /100
           </p>
         </div>
       </div>
@@ -52,11 +52,13 @@ export default {
     position: relative;
     color: #c5c7cc;
     .air {
+      margin-left: 25px;
       margin-top: 25px;
       width: 100%;
       height: 80%;
     }   
     .text {
+margin-left: 15px;
      margin-top: -20px;
       width: 100%;
       height: 20%;
diff --git a/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue b/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue
index ea5d4f51..cf07eef4 100644
--- a/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue
@@ -7,18 +7,18 @@
           <div class="waterDiv">
             <span class="span1">本月用电</span>
             <span class="numberStyle">2700</span>
-            <span>度</span>
+            <span>kwh</span>
           </div>
 
           <div class="waterDiv">
             <span class="span2" id="spanes">用电超标值 </span>
             <span class="numberStyle">2700</span>
-            <span >度</span>
+            <span >kwh</span>
           </div>
           <div class="waterDiv">
             <span class="span3">累计节约电量</span>
             <span class="numberStyle">2700</span>
-            <span>度</span>
+            <span>kwh</span>
           </div>
         </div>
 
@@ -26,18 +26,18 @@
           <div class="waterDiv">
             <span  class="span1">本月用水</span>
             <span class="numberStyle">2700</span>
-            <span>吨</span>
+            <span>t</span>
           </div>
 
           <div class="waterDiv">
             <span class="span2">用水超标值</span>
             <span class="numberStyle">2700</span>
-            <span>吨</span>
+            <span>t</span>
           </div>
           <div class="waterDiv">
             <span class="span3">累计节约水量</span>
             <span class="numberStyle">2700</span>
-            <span>吨</span>
+            <span>t</span>
           </div>
         </div>
       </div>
diff --git a/src/views/projectAdmin/fourEngin/carbon/rightTop.vue b/src/views/projectAdmin/fourEngin/carbon/rightTop.vue
index 54588c7d..6a272878 100644
--- a/src/views/projectAdmin/fourEngin/carbon/rightTop.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/rightTop.vue
@@ -5,13 +5,13 @@
       <div class="leftWeather">
         <div class="image"><img src="@/views/projectAdmin/fourEngin/assets/images/carbon/sunnyone.png" /></div>
         <div class="text"><p>累计降低二氧化碳排放量为</p></div>
-        <div class="bottomNumber"><span>259</span>吨</div>
+        <div class="bottomNumber"><span>259</span>t</div>
       </div>
 
       <div class="rightWeather">
         <div class="image"><img src="@/views/projectAdmin/fourEngin/assets/images/carbon/sunnytwo.png" /></div>
         <div class="text"><p>太阳能发电累计节约电量</p></div>
-        <div class="bottomNumber"><span>17900</span>度</div>
+        <div class="bottomNumber"><span>17900</span>kwh</div>
       </div>
     </div>
   </Card>
diff --git a/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue b/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
index d0a75151..384d70b1 100644
--- a/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
+++ b/src/views/projectAdmin/fourEngin/quality/leftMiddle.vue
@@ -12,7 +12,7 @@
         <div class="icon humidity"></div>
         <div class="info">
           <div class="label">室内湿度</div>
-          <div class="value"><span>26</span> ℃</div>
+          <div class="value"><span>26</span>%RH</div>
         </div>
       </div>
       <div class="item">

From 0e66408b679f90d0a06fe7d9473c7fec5d8bb0fd Mon Sep 17 00:00:00 2001
From: yjl <1490736767@qq.com>
Date: Fri, 21 Oct 2022 17:46:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80?=
 =?UTF-8?q?=EF=BC=88=E5=8F=8C=E7=A2=B3=E7=AE=A1=E7=90=86=EF=BC=89=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E7=BB=86=E8=8A=82=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectAdmin/fourEngin/carbon/leftCenter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
index 4040a4c2..e98eb04e 100644
--- a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
@@ -18,7 +18,7 @@
                 <td>一号设备</td>
                 <td>离线</td>
                 <td>pm2.5</td>
-                <td>μg/m3</td>
+                <td>0.1μg/m3</td>
                 <td>2次</td>
               </tr>
             </tbody>