liu_li
/
yxk-storeroom-system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

报警状态curstatus>0报警,摄像头端口可以配置

master
z_yu 2 years ago
parent
a25b813c04
commit
6add2b6a7f
4 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .env.production
  2. 14
      src/views/storeManage/warehouse3D/archivesStorage/index.vue
  3. 2
      src/views/storeManage/warehouse3D/collateRoom/index.vue
  4. 2
      src/views/storeManage/warehouse3D/readRoom/index.vue

2
.env.production
View File

@ -6,4 +6,4 @@ ENV = 'production'
VUE_APP_BASE_API = 'http://192.168.99.107:7070' VUE_APP_BASE_API = 'http://192.168.99.107:7070'
# 如果接口是 http 形式， wss 需要改为 ws # 如果接口是 http 形式， wss 需要改为 ws
VUE_APP_WS_API = 'ws://192.168.99.107:7071' 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'

14
src/views/storeManage/warehouse3D/archivesStorage/index.vue
View File

@ -5,42 +5,42 @@
<div class="left-3d"> <div class="left-3d">
<iframe id="myIframe" ref="myIframe" name="iframeMap" class="iframe_box" src="/webA/index.html" frameborder="0" scrolling="no" /> <iframe id="myIframe" ref="myIframe" name="iframeMap" class="iframe_box" src="/webA/index.html" frameborder="0" scrolling="no" />
<ul class="msg-list"> <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" /> <svg-icon icon-class="temperature" class-name="msg-list-svg" />
<div class="msg-txt"> <div class="msg-txt">
<span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_001.curValue }}</span> <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_001.curValue }}</span>
<p class="msg-list-unit">温度 {{ topDisplayData.DAK_DIV_TOP_001.unit }}</p> <p class="msg-list-unit">温度 {{ topDisplayData.DAK_DIV_TOP_001.unit }}</p>
</div> </div>
</li> </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" /> <svg-icon icon-class="shidu" class-name="msg-list-svg" />
<div class="msg-txt"> <div class="msg-txt">
<span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_002.curValue }}</span> <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_002.curValue }}</span>
<p class="msg-list-unit">湿度 {{ topDisplayData.DAK_DIV_TOP_002.unit }}</p> <p class="msg-list-unit">湿度 {{ topDisplayData.DAK_DIV_TOP_002.unit }}</p>
</div> </div>
</li> </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" /> <svg-icon icon-class="co2" class-name="msg-list-svg" />
<div class="msg-txt"> <div class="msg-txt">
<span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_003.curValue }}</span> <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> <p class="msg-list-unit">CO2 {{ topDisplayData.DAK_DIV_TOP_003.unit }}</p>
</div> </div>
</li> </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" /> <svg-icon icon-class="voc" class-name="msg-list-svg" />
<div class="msg-txt"> <div class="msg-txt">
<span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_004.curValue }}</span> <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> <p class="msg-list-unit">VOC {{ topDisplayData.DAK_DIV_TOP_004.unit }}</p>
</div> </div>
</li> </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" /> <svg-icon icon-class="pm25" class-name="msg-list-svg" />
<div class="msg-txt"> <div class="msg-txt">
<span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_005.curValue }}</span> <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> <p class="msg-list-unit">PM2.5 {{ topDisplayData.DAK_DIV_TOP_005.unit }}</p>
</div> </div>
</li> </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" /> <svg-icon icon-class="pm10" class-name="msg-list-svg" />
<div class="msg-txt"> <div class="msg-txt">
<span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_006.curValue }}</span> <span class="msg-list-num">{{ topDisplayData.DAK_DIV_TOP_006.curValue }}</span>
@ -283,7 +283,7 @@ export default {
id: element.divPosition, id: element.divPosition,
wendu: (wendu?.curvalue) ? (Math.round(wendu?.curvalue)) : '-', wendu: (wendu?.curvalue) ? (Math.round(wendu?.curvalue)) : '-',
sidu: (sidu?.curvalue) ? (Math.round(sidu?.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)
}) })
} }
}) })

2
src/views/storeManage/warehouse3D/collateRoom/index.vue
View File

@ -120,7 +120,7 @@ export default {
id: element.divPosition, id: element.divPosition,
wendu: (wendu?.curvalue) ? (Math.round(wendu?.curvalue)) : '-', wendu: (wendu?.curvalue) ? (Math.round(wendu?.curvalue)) : '-',
sidu: (sidu?.curvalue) ? (Math.round(sidu?.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)
}) })
} }
}) })

2
src/views/storeManage/warehouse3D/readRoom/index.vue
View File

@ -115,7 +115,7 @@ export default {
id: element.divPosition, id: element.divPosition,
wendu: (wendu?.curvalue) ? (Math.round(wendu?.curvalue)) : '-', wendu: (wendu?.curvalue) ? (Math.round(wendu?.curvalue)) : '-',
sidu: (sidu?.curvalue) ? (Math.round(sidu?.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)
}) })
} }
}) })

Write Preview
Loading…
Cancel
Save