From 05b03aa8cc49dc9415c011522433dd261704cc5b Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Sat, 17 Dec 2022 13:22:45 +0800
Subject: [PATCH] src/utils/request冲突解决提交

---
 src/views/deviceDetail/index.vue |   54 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index 5e33e9e..eff6d6c 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -118,12 +118,12 @@
         <div class="right1" style="height:40%;display: flex;flex-direction: column;" v-else>
           <h3 style="text-align:center; font-size: 0.9rem">���������</h3>
           <ul class="listUl" style="overflow: auto;padding:0 10%;font-size: 0.9rem; margin-top: 0">
-            <li :class="{liActive:libg==i}">PM2.5: &nbsp;[ 0, 35 ]</li>
-            <li :class="{liActive:libg==i}">PM10: &nbsp;&nbsp;[ 0, 50 ]</li>
-            <li :class="{liActive:libg==i}">NO2: &nbsp;&nbsp;&nbsp;&nbsp;[ 0, 40 ]</li>
-            <li :class="{liActive:libg==i}">SO2: &nbsp;&nbsp;&nbsp;&nbsp;[ 0, 50 ]</li>
-            <li :class="{liActive:libg==i}">CO: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 0, 2 ]</li>
-            <li :class="{liActive:libg==i}">O3: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 0, 100 ]</li>
+            <li>PM2.5: &nbsp;[ 0, 35 ]</li>
+            <li>PM10: &nbsp;&nbsp;[ 0, 50 ]</li>
+            <li>NO2: &nbsp;&nbsp;&nbsp;&nbsp;[ 0, 40 ]</li>
+            <li>SO2: &nbsp;&nbsp;&nbsp;&nbsp;[ 0, 50 ]</li>
+            <li>CO: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 0, 2 ]</li>
+            <li>O3: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 0, 160 ]</li>
           </ul>
         </div>
       </el-main>
@@ -183,6 +183,29 @@
       alarmLevels: null,
       // ������������
       alarmLevel: null,
+      alarmLevelDome: {
+        a00e12: '[10000, 15000, 20000]',
+        a00e13: '[60, 90, 120]',
+        a00e34: null,
+        a35e21: null,
+        a01001: '[25, 30, 60]',
+        a01002: '[60, 100, 160]',
+        a01006: null,
+        a01007: '[5, 6, 8]',
+        a01008: null,
+        a05024: '[160, 200, 300, 400, 800]',
+        a06001: null,
+        a19002: null,
+        a21004: '[100, 200, 700, 1200, 2340]',
+        a21005: '[5, 10, 35, 60, 90]',
+        a21026: '[150, 500, 650, 800, 1600]',
+        a34002: '[50, 150, 250, 350, 420]',
+        a34004: '[35, 75, 115, 150, 250]',
+        a99054: '[1.5, 3, 5]',
+        dustld: null,
+        flylat: null,
+        flylon: null
+      }, // ������������������
       // ���������������
       alarmProgress: {},
       // ������������
@@ -463,6 +486,7 @@
       var socketUrl
       if (this.equipment === 'car') {
         socketUrl = 'http://47.99.64.149:8081/cruiserWebsocket/' + this.macName
+        // socketUrl = 'http://192.168.0.33:8081/cruiserWebsocket/' + this.macName
       } else {
         socketUrl = 'http://47.99.64.149:8081/singleDevice/' + this.macName
       }
@@ -479,6 +503,9 @@
       this.ws.onmessage = function(msg) {
         // if (JSON.parse(msg.data).������) {
         that.wsData2 = JSON.parse(msg.data)
+        if (that.wsData2.dustld) {
+          that.wsData2.dustld = that.wsData2.dustld.replace(/g/, 'ug')
+        }
         // console.log('���������websocket������������')
         // console.log(that.wsData2)
         // ������������
@@ -843,7 +870,20 @@
       }).then((res) => {
         // console.log('���������queryAlarmByMac���������������')
         this.alarmLevel = res.data.alarmLevel
-        // console.log(this.alarmLevel)
+        // var levelList = res.data.alarmLevel
+        // var info = false
+        // for (let key in levelList) {
+        //   if (levelList[key] !== null) {
+        //     info = true
+        //     break
+        //   }
+        // }
+        // if (info) {
+        //   this.alarmLevel = res.data.alarmLevel
+        // } else {
+        //   this.alarmLevel = this.alarmLevelDome
+        // }
+        // console.log(this.alarmLevel, 'this.alarmLevel')
       }).catch((err) => {
         console.log(err)
       })

--
Gitblit v1.8.0