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

---
 .../langs/cn/environmentalMonitor/overview.js |  6 +--
 .../fourEngin/carbon/centerTop.vue            | 52 +++++++++++++------
 .../fourEngin/carbon/leftCenter.vue           |  2 +-
 .../fourEngin/carbon/rightCenter.vue          |  2 +-
 4 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/assets/i18n/langs/cn/environmentalMonitor/overview.js b/src/assets/i18n/langs/cn/environmentalMonitor/overview.js
index 64410cf1..9e75d5d7 100644
--- a/src/assets/i18n/langs/cn/environmentalMonitor/overview.js
+++ b/src/assets/i18n/langs/cn/environmentalMonitor/overview.js
@@ -42,7 +42,7 @@ export default {
             name: "PM2.5",
             value: "--",
             id:2,
-            unit:'μg/m3'
+            unit:'μg/m³'
         },
         {
             name: "温度",
@@ -54,7 +54,7 @@ export default {
             name: "TSP",
             value: "79",
             id:4,
-            unit:'μg/m3'
+            unit:'μg/m³'
         },
         {
             name: "风速",
@@ -66,7 +66,7 @@ export default {
             name: "PM10",
             value: "30",
             id:6,
-            unit:'μg/m3'
+            unit:'μg/m³'
         },
         {
             name: "风向",
diff --git a/src/views/projectAdmin/fourEngin/carbon/centerTop.vue b/src/views/projectAdmin/fourEngin/carbon/centerTop.vue
index 6c9a69ee..e8a82e1d 100644
--- a/src/views/projectAdmin/fourEngin/carbon/centerTop.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/centerTop.vue
@@ -6,14 +6,14 @@
     </div>
     <div class="right3">
       <div class="dropDown" v-show="0 === number">
-        <el-dropdown>
-          <span class="el-dropdown-link"> 设备一<i class="el-icon-arrow-down el-icon--right"></i> </span>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item>设备二</el-dropdown-item>
-            <el-dropdown-item>设备三</el-dropdown-item>
-            
-          </el-dropdown-menu>
-        </el-dropdown>
+         <el-select v-model="Equipment" >
+         <el-option
+      v-for="item in options"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value">
+    </el-option>
+  </el-select>
       </div>
       <div v-show="0 === number" ref="centerChart" class="centerChart" id="right2"></div>
       <div class="right4" v-show="1 === number">
@@ -38,6 +38,23 @@ export default {
   },
   data() {
     return {
+       options: 
+       [
+        {
+          value: '设备一',
+          label: '设备一'
+        }, 
+        {
+          value: '设备二',
+          label: '设备二'
+        }, 
+        {
+          value: '设备三',
+          label: '设备三'
+        }, 
+       
+        ],
+        Equipment: '设备一',
       number: 0,
       devList: [],
       currentDevDetail: {},
@@ -463,18 +480,23 @@ export default {
       margin-right: 40px;
       margin-top: -20px;
       width: 100px;
-      height: 30px;
-      line-height: 30px;
+      height: 20px;
+      line-height: 20px;
       background-color: #305c6d;
       background-image: url(../assets/images/common/bg_sby.png);
       background-repeat: no-repeat;
       background-size: 100%;
       font-size: 8px;
-     .el-dropdown-link {
-      color: #Fff;
-     }
-     .el-icon-arrow-down{
-      margin-left: 15px;
+     ::v-deep .el-select{
+        width: 100px;
+        height: 20px;
+      }
+     ::v-deep .el-input__inner {
+      background-color: #3e7c86;
+      color: #fff;
+      }
+     ::v-deep .el-select__caret {
+       color: #fff;
      }
     }
   }
diff --git a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
index e98eb04e..2157ab91 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.1μg/m3</td>
+                <td>0.1μg/m³</td>
                 <td>2次</td>
               </tr>
             </tbody>
diff --git a/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue b/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue
index 65963708..81a4d874 100644
--- a/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue
@@ -37,7 +37,7 @@
           <div class="waterDiv">
             <span class="span3">本月报警次数</span>
             <span class="numberStyle">{{realTimeData.alarmNum}}</span>
-            <span>t</span>
+            <span>次</span>
           </div>
         </div>
       </div>