From 6add2b6a7f0220fa0dbcbd332fa9b88caea93810 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Wed, 14 Sep 2022 10:30:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E7=8A=B6=E6=80=81curstatus>0?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6,=E6=91=84=E5=83=8F=E5=A4=B4=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=AF=E4=BB=A5=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                    |  2 +-
 .../warehouse3D/archivesStorage/index.vue          | 14 +++++++-------
 .../storeManage/warehouse3D/collateRoom/index.vue  |  2 +-
 .../storeManage/warehouse3D/readRoom/index.vue     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.env.production b/.env.production
index 1d3db93..04b6c4c 100644
--- a/.env.production
+++ b/.env.production
@@ -6,4 +6,4 @@ ENV = 'production'
 VUE_APP_BASE_API  = 'http://192.168.99.107:7070'
 # 如果接口是 http 形式， wss 需要改为 ws
 VUE_APP_WS_API = 'ws://192.168.99.107:7071'
-VUE_APP_CAMERA_API = '192.168.99.107'
+VUE_APP_CAMERA_API = '192.168.99.107:3000'
diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
index dd4ddeb..1e63b78 100644
--- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue
+++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue
@@ -5,42 +5,42 @@
       <div class="left-3d">
         <iframe id="myIframe" ref="myIframe" name="iframeMap" class="iframe_box" src="/webA/index.html" frameborder="0" scrolling="no" />
         <ul class="msg-list">
-          <li v-show="topDisplayData.DAK_DIV_TOP_001.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_001.curstatus === '1' }">
+          <li v-show="topDisplayData.DAK_DIV_TOP_001.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_001.curstatus > 0 }">
             <svg-icon icon-class="temperature" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_001.curValue }}</span>
               <p class="msg-list-unit">温度 {{ topDisplayData.DAK_DIV_TOP_001.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_002.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_002.curstatus === '1' }">
+          <li v-show="topDisplayData.DAK_DIV_TOP_002.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_002.curstatus > 0 }">
             <svg-icon icon-class="shidu" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_002.curValue }}</span>
               <p class="msg-list-unit">湿度 {{ topDisplayData.DAK_DIV_TOP_002.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_003.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_003.curstatus === '1' }">
+          <li v-show="topDisplayData.DAK_DIV_TOP_003.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_003.curstatus > 0 }">
             <svg-icon icon-class="co2" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_003.curValue }}</span>
               <p class="msg-list-unit">CO2 {{ topDisplayData.DAK_DIV_TOP_003.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_004.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_004.curstatus === '1' }">
+          <li v-show="topDisplayData.DAK_DIV_TOP_004.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_004.curstatus > 0 }">
             <svg-icon icon-class="voc" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_004.curValue }}</span>
               <p class="msg-list-unit">VOC {{ topDisplayData.DAK_DIV_TOP_004.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_005.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_005.curstatus !== '0' }" class="msg-pm">
+          <li v-show="topDisplayData.DAK_DIV_TOP_005.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_005.curstatus > 0 }" class="msg-pm">
             <svg-icon icon-class="pm25" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_005.curValue }}</span>
               <p class="msg-list-unit">PM2.5 {{ topDisplayData.DAK_DIV_TOP_005.unit }}</p>
             </div>
           </li>
-          <li v-show="topDisplayData.DAK_DIV_TOP_006.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_006.curstatus !== '0' }" class="msg-pm">
+          <li v-show="topDisplayData.DAK_DIV_TOP_006.show" :class="{ 'li-warn': topDisplayData.DAK_DIV_TOP_006.curstatus > 0 }" class="msg-pm">
             <svg-icon icon-class="pm10" class-name="msg-list-svg" />
             <div class="msg-txt">
               <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_006.curValue }}</span>
@@ -283,7 +283,7 @@ export default {
                 id: element.divPosition,
                 wendu: (wendu?.curvalue) ? (Math.round(wendu?.curvalue)) : '-',
                 sidu: (sidu?.curvalue) ? (Math.round(sidu?.curvalue)) : '-',
-                alarmState: (wendu && wendu.curstatus !== '0') || (sidu && sidu.curstatus !== '0')
+                alarmState: (wendu && wendu.curstatus > 0) || (sidu && sidu.curstatus > 0)
               })
             }
           })
diff --git a/src/views/storeManage/warehouse3D/collateRoom/index.vue b/src/views/storeManage/warehouse3D/collateRoom/index.vue
index 017d3f3..787c16b 100644
--- a/src/views/storeManage/warehouse3D/collateRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/collateRoom/index.vue
@@ -120,7 +120,7 @@ export default {
                 id: element.divPosition,
                 wendu: (wendu?.curvalue) ? (Math.round(wendu?.curvalue)) : '-',
                 sidu: (sidu?.curvalue) ? (Math.round(sidu?.curvalue)) : '-',
-                alarmState: (wendu && wendu.curstatus === '1') || (sidu && sidu.curstatus === '1')
+                alarmState: (wendu && wendu.curstatus > 0) || (sidu && sidu.curstatus > 0)
               })
             }
           })
diff --git a/src/views/storeManage/warehouse3D/readRoom/index.vue b/src/views/storeManage/warehouse3D/readRoom/index.vue
index b797922..68bd4f3 100644
--- a/src/views/storeManage/warehouse3D/readRoom/index.vue
+++ b/src/views/storeManage/warehouse3D/readRoom/index.vue
@@ -115,7 +115,7 @@ export default {
                 id: element.divPosition,
                 wendu: (wendu?.curvalue) ? (Math.round(wendu?.curvalue)) : '-',
                 sidu: (sidu?.curvalue) ? (Math.round(sidu?.curvalue)) : '-',
-                alarmState: (wendu && wendu.curstatus === '1') || (sidu && sidu.curstatus === '1')
+                alarmState: (wendu && wendu.curstatus > 0) || (sidu && sidu.curstatus > 0)
               })
             }
           })