From 5bbcdadbb201985f7bafcc60bd679d9e6f0e4229 Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Mon, 12 Dec 2022 13:24:57 +0800
Subject: [PATCH] 1.浑南区走航车报告下载；2.菜单分配可以选择某个子菜单，但必须选择实时风场页面；3.空气质量报告模板更新；

---
 src/views/deviceDetail/index.vue |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/views/deviceDetail/index.vue b/src/views/deviceDetail/index.vue
index 0532bf1..eff6d6c 100644
--- a/src/views/deviceDetail/index.vue
+++ b/src/views/deviceDetail/index.vue
@@ -123,7 +123,7 @@
             <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, 100 ]</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