dedsudiyu дней назад: 2
Родитель
Сommit
5a7ee0f63d
100 измененных файлов с 127 добавлено и 26 удалено
  1. 1 1
      .env.development
  2. 1 1
      .env.production
  3. 26 24
      src/App.vue
  4. 99 0
      src/api/index.js
  5. BIN
      src/assets/emergencyManagement/cgq/icon_yg_yc.png
  6. BIN
      src/assets/emergencyManagement/cgq/icon_yg_zc.png
  7. BIN
      src/assets/emergencyManagement/cgq/icon_yygb_gq.png
  8. BIN
      src/assets/emergencyManagement/cgq/icon_yygb_gq_yc.png
  9. BIN
      src/assets/emergencyManagement/cgq/icon_zdmh_hyjc_yc.png
  10. BIN
      src/assets/emergencyManagement/cgq/icon_zdmh_hyjc_zc.png
  11. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_dqy.png
  12. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_dqy_yc.png
  13. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_fc.png
  14. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_fc_yc.png
  15. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_he.png
  16. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_he_yc.png
  17. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_hwcw.png
  18. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_hwcw_yc.png
  19. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_jq_yc.png
  20. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_jq_zc.png
  21. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_jw.png
  22. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_jw_yc.png
  23. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_lq.png
  24. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_lq_yc.png
  25. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_noy.png
  26. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_noy_yc.png
  27. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_sd.png
  28. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_sd_yc.png
  29. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_soe_yc.png
  30. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_soer.png
  31. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_tcoc.png
  32. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_tcoc_yc.png
  33. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_voc.png
  34. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_voc_yc.png
  35. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_wsd.png
  36. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_wsd_yc.png
  37. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_yq_yc.png
  38. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_yq_zc.png
  39. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_yyht_yc.png
  40. BIN
      src/assets/emergencyManagement/cgq/icon_znjc_yyht_zc.png
  41. BIN
      src/assets/emergencyManagement/icon_cgqbg_yc.png
  42. BIN
      src/assets/emergencyManagement/icon_cgqbg_zc.png
  43. BIN
      src/assets/emergencyManagement/icon_dp_bjsj.png
  44. BIN
      src/assets/emergencyManagement/icon_dqkz.png
  45. BIN
      src/assets/emergencyManagement/icon_dzya_dfx.png
  46. BIN
      src/assets/emergencyManagement/icon_dzya_gfx.png
  47. BIN
      src/assets/emergencyManagement/icon_dzya_jgfx.png
  48. BIN
      src/assets/emergencyManagement/icon_dzya_zfx.png
  49. BIN
      src/assets/emergencyManagement/icon_jjck.png
  50. BIN
      src/assets/emergencyManagement/icon_lc_yc.png
  51. BIN
      src/assets/emergencyManagement/icon_pmbjt_m.png
  52. BIN
      src/assets/emergencyManagement/icon_pmt_ry.png
  53. BIN
      src/assets/emergencyManagement/icon_sblx.png
  54. BIN
      src/assets/emergencyManagement/icon_shang_hs.png
  55. BIN
      src/assets/emergencyManagement/icon_sjt.png
  56. BIN
      src/assets/emergencyManagement/icon_sspt_ljssbk.png
  57. BIN
      src/assets/emergencyManagement/icon_sysnry_jk.png
  58. BIN
      src/assets/emergencyManagement/icon_sysnry_tb.png
  59. BIN
      src/assets/emergencyManagement/icon_xia_hs.png
  60. BIN
      src/assets/emergencyManagement/icon_xjt.png
  61. BIN
      src/assets/emergencyManagement/icon_yjzh_fh.png
  62. BIN
      src/assets/emergencyManagement/icon_you_hs.png
  63. BIN
      src/assets/emergencyManagement/icon_yuo.png
  64. BIN
      src/assets/emergencyManagement/icon_yygb_tb.png
  65. BIN
      src/assets/emergencyManagement/icon_yygb_wxy.png
  66. BIN
      src/assets/emergencyManagement/icon_zdmh.png
  67. BIN
      src/assets/emergencyManagement/icon_zdmh_hyjc_yc.png
  68. BIN
      src/assets/emergencyManagement/icon_zdmh_hyjc_zc.png
  69. BIN
      src/assets/emergencyManagement/icon_zdmh_wd_yc.png
  70. BIN
      src/assets/emergencyManagement/icon_zdmh_wd_zc.png
  71. BIN
      src/assets/emergencyManagement/icon_zdmh_yg_yc.png
  72. BIN
      src/assets/emergencyManagement/icon_zdmh_yg_zc.png
  73. BIN
      src/assets/emergencyManagement/icon_zhpt_rs.png
  74. BIN
      src/assets/emergencyManagement/icon_znjc_bg.png
  75. BIN
      src/assets/emergencyManagement/icon_znjc_tb.png
  76. BIN
      src/assets/emergencyManagement/icon_znkz_bg.png
  77. BIN
      src/assets/emergencyManagement/icon_znkz_dy.png
  78. BIN
      src/assets/emergencyManagement/icon_znkz_tb.png
  79. BIN
      src/assets/emergencyManagement/icon_znkz_tf.png
  80. BIN
      src/assets/emergencyManagement/icon_znkz_wq.png
  81. BIN
      src/assets/emergencyManagement/icon_zou_hs.png
  82. BIN
      src/assets/emergencyManagement/icon_zuo.png
  83. BIN
      src/assets/emergencyManagement/img_bg.png
  84. BIN
      src/assets/emergencyManagement/img_bg_kd.png
  85. BIN
      src/assets/emergencyManagement/img_bg_yatk.png
  86. BIN
      src/assets/emergencyManagement/img_mhz.png
  87. BIN
      src/assets/emergencyManagement/img_yc_bg.png
  88. BIN
      src/assets/emergencyManagement/img_yh_db_zdmh.png
  89. BIN
      src/assets/emergencyManagement/img_yh_db_zdmh_yc.png
  90. BIN
      src/assets/emergencyManagement/img_yh_dd_zdmh.png
  91. BIN
      src/assets/emergencyManagement/img_yh_dd_zdmh_yc.png
  92. BIN
      src/assets/emergencyManagement/img_yh_zj_zdmh.png
  93. BIN
      src/assets/emergencyManagement/img_yh_zj_zdmh_yc.png
  94. BIN
      src/assets/emergencyManagement/img_zc_bg.png
  95. BIN
      src/assets/emergencyManagement/img_zdmh_fcjc.png
  96. BIN
      src/assets/emergencyManagement/img_zdmh_hyjc.png
  97. BIN
      src/assets/emergencyManagement/img_zdmh_qtjc.png
  98. BIN
      src/assets/emergencyManagement/img_zdmh_wsd(1).png
  99. BIN
      src/assets/emergencyManagement/img_zdmh_wsd.png
  100. 0 0
      src/assets/emergencyManagement/img_zdmh_ycbg.png

+ 1 - 1
.env.development

@@ -8,4 +8,4 @@ VUE_APP_TITLE=中国安全生产科学研究院实验室安全智慧化管控中
 VUE_APP_BASE_API=http://192.168.1.8/api
 
 # 接口超时时间(毫秒)
-VUE_APP_TIMEOUT=10000
+VUE_APP_TIMEOUT=20000

+ 1 - 1
.env.production

@@ -8,4 +8,4 @@ VUE_APP_TITLE=中国安全生产科学研究院实验室安全智慧化管控中
 VUE_APP_BASE_API=http://192.168.1.8/api
 
 # 接口超时时间(毫秒)
-VUE_APP_TIMEOUT=15000
+VUE_APP_TIMEOUT=20000

+ 26 - 24
src/App.vue

@@ -5,21 +5,29 @@
         <router-view />
       </div>
     </div>
-    <AlertModal ref="alertModal" />
+    <AlarmWindow
+        v-if="showAlarm"
+        :alarm-data="alarmData"
+        @close="showAlarm = false"
+    />
   </div>
 </template>
 
 <script>
-import AlertModal from '@/components/AlertModal.vue'
+  import AlarmWindow from '@/components/alarmWindow/index.vue'
 import mqtt from 'mqtt'
 import { getMqttConfig, getTriggerInfo } from '@/api'
 import { Decrypt } from '@/utils/decrypt'
 
 export default {
   name: 'App',
-  components: { AlertModal },
+  components: { AlarmWindow },
   data() {
-    return { mqttClient: null }
+    return {
+      showAlarm: false,
+      alarmData:null,
+      mqttClient: null ,
+    }
   },
   computed: {
     token() { return this.$store.state.token }
@@ -117,27 +125,21 @@ export default {
     },
     async getTriggerInfo() {
       const res = await getTriggerInfo()
-      const list = res.data || []
-      if (list.length > 0) {
-        const e = list[0]
-        const obj = JSON.parse(e.triggerUploadData)[0]
-        const deviceValue = obj.deviceValue
-        const unit = obj.unit
-        this.$refs.alertModal.show({
-          lab: e.subName + (e.roomNum ? `(${e.roomNum})` : ''),
-          building: [e.schoolName, e.buildName, e.floorName].filter(Boolean).join(' · '),
-          unit: e.deptName,
-          param: e.eventName,
-          value: deviceValue+''+(unit=='-'?'':unit),
-          person: e.adminName,
-          phone: e.adminPhone,
-          time: e.eventStartTime ? e.eventStartTime.replace('T', ' ') : '',
-          buildId:e.buildId,
-          floorId:e.floorId,
-          subId:e.subId,
-        })
+      if (res.code === 200 && res.data && res.data.length) {
+        res.data[0].triggerUploadData = JSON.parse(res.data[0].triggerUploadData)
+        for(let i=0;i<res.data[0].bindingSensorList.length;i++){
+          for(let o=0;o<res.data[0].triggerUploadData.length;o++){
+            if(res.data[0].bindingSensorList[i].code == res.data[0].triggerUploadData[o].code){
+              res.data[0].triggerUploadData[o].max = res.data[0].bindingSensorList[i].max
+              res.data[0].triggerUploadData[o].min = res.data[0].bindingSensorList[i].min
+            }
+          }
+        }
+        this.$set(this,'alarmData', res.data[0]);
+        this.$set(this,'showAlarm',true);
       }else{
-        this.$refs.alertModal.close();
+        this.$set(this,'showAlarm',false);
+        this.$set(this,'alarmData', {});
       }
     }
   }

+ 99 - 0
src/api/index.js

@@ -254,3 +254,102 @@ export async function laboratoryLabScreenDeptDropList(params) {
   if (res.code === 200 && res.data) return wrapResult(res.data)
   throw new Error(res.message || res.msg || '接口异常')
 }
+
+//应急处置-获取楼层布局数据
+export function laboratoryBigViewGetFloorByBigView(params) {
+  return request({
+    url: '/laboratory/bigView/getFloorByBigView',
+    method: 'get',
+    params
+  })
+}
+//应急处置-查询当前正在发生的预案
+export function laboratoryBigViewSelectTriggerInfo(params) {
+  return request({
+    url: '/laboratory/bigView/selectTriggerInfo',
+    method: 'get',
+    params
+  })
+}
+//应急处置-获取当前楼栋-楼层下的疏散数据
+export function laboratoryExitLineGetRedisEvacuation(data = {}) {
+  return request({
+    url: '/laboratory/exitLine/getRedisEvacuation',
+    method: 'post',
+    data
+  })
+}
+
+//获取摄像头流地址
+export function iotCameraFindByCondition(data = {}) {
+  return request({
+    url: '/iot/camera/findByCondition',
+    method: 'post',
+    data
+  })
+}
+//应急处置-查询实验室传感器列表
+export function iotBigViewDeviceFindBySubId(params) {
+  return request({
+    url: '/iot/bigView/device/findBySubId',
+    method: 'get',
+    params
+  })
+}
+
+//应急处置-查询实验室喇叭列表
+export function iotBigViewDeviceFindByType(data = {}) {
+  return request({
+    url: '/iot/bigView/device/findByType',
+    method: 'post',
+    data
+  })
+}
+//应急处置-结束预案
+export function laboratoryPlanCloseRiskPlan(params) {
+  return request({
+    url: '/laboratory/plan/closeRiskPlan',
+    method: 'get',
+    params
+  })
+}
+//应急处置-结束疏散
+export function laboratoryExitLineEndEvacuation(data = {}) {
+  return request({
+    url: '/laboratory/exitLine/endEvacuation',
+    method: 'post',
+    data
+  })
+}
+//应急处置-开灯
+export function laboratoryExitRelayOpenLight(data = {}) {
+  return request({
+    url: '/laboratory/exitRelay/openLight',
+    method: 'post',
+    data
+  })
+}
+//应急处置-关灯
+export function laboratoryExitRelayCloseLight(data = {}) {
+  return request({
+    url: '/laboratory/exitRelay/closeLight',
+    method: 'post',
+    data
+  })
+}
+//应急处置-执行疏散
+export function laboratoryExitLineExecuteEvacuation(data = {}) {
+  return request({
+    url: '/laboratory/exitLine/executeEvacuation',
+    method: 'post',
+    data
+  })
+}
+//应急处置-喇叭播放文本
+export function iotBigViewSpeakerPlayText(params) {
+  return request({
+    url: '/iot/bigView/speaker/playText',
+    method: 'get',
+    params
+  })
+}

BIN
src/assets/emergencyManagement/cgq/icon_yg_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_yg_zc.png


BIN
src/assets/emergencyManagement/cgq/icon_yygb_gq.png


BIN
src/assets/emergencyManagement/cgq/icon_yygb_gq_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_zdmh_hyjc_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_zdmh_hyjc_zc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_dqy.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_dqy_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_fc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_fc_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_he.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_he_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_hwcw.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_hwcw_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_jq_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_jq_zc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_jw.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_jw_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_lq.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_lq_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_noy.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_noy_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_sd.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_sd_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_soe_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_soer.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_tcoc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_tcoc_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_voc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_voc_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_wsd.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_wsd_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_yq_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_yq_zc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_yyht_yc.png


BIN
src/assets/emergencyManagement/cgq/icon_znjc_yyht_zc.png


BIN
src/assets/emergencyManagement/icon_cgqbg_yc.png


BIN
src/assets/emergencyManagement/icon_cgqbg_zc.png


BIN
src/assets/emergencyManagement/icon_dp_bjsj.png


BIN
src/assets/emergencyManagement/icon_dqkz.png


BIN
src/assets/emergencyManagement/icon_dzya_dfx.png


BIN
src/assets/emergencyManagement/icon_dzya_gfx.png


BIN
src/assets/emergencyManagement/icon_dzya_jgfx.png


BIN
src/assets/emergencyManagement/icon_dzya_zfx.png


BIN
src/assets/emergencyManagement/icon_jjck.png


BIN
src/assets/emergencyManagement/icon_lc_yc.png


BIN
src/assets/emergencyManagement/icon_pmbjt_m.png


BIN
src/assets/emergencyManagement/icon_pmt_ry.png


BIN
src/assets/emergencyManagement/icon_sblx.png


BIN
src/assets/emergencyManagement/icon_shang_hs.png


BIN
src/assets/emergencyManagement/icon_sjt.png


BIN
src/assets/emergencyManagement/icon_sspt_ljssbk.png


BIN
src/assets/emergencyManagement/icon_sysnry_jk.png


BIN
src/assets/emergencyManagement/icon_sysnry_tb.png


BIN
src/assets/emergencyManagement/icon_xia_hs.png


BIN
src/assets/emergencyManagement/icon_xjt.png


BIN
src/assets/emergencyManagement/icon_yjzh_fh.png


BIN
src/assets/emergencyManagement/icon_you_hs.png


BIN
src/assets/emergencyManagement/icon_yuo.png


BIN
src/assets/emergencyManagement/icon_yygb_tb.png


BIN
src/assets/emergencyManagement/icon_yygb_wxy.png


BIN
src/assets/emergencyManagement/icon_zdmh.png


BIN
src/assets/emergencyManagement/icon_zdmh_hyjc_yc.png


BIN
src/assets/emergencyManagement/icon_zdmh_hyjc_zc.png


BIN
src/assets/emergencyManagement/icon_zdmh_wd_yc.png


BIN
src/assets/emergencyManagement/icon_zdmh_wd_zc.png


BIN
src/assets/emergencyManagement/icon_zdmh_yg_yc.png


BIN
src/assets/emergencyManagement/icon_zdmh_yg_zc.png


BIN
src/assets/emergencyManagement/icon_zhpt_rs.png


BIN
src/assets/emergencyManagement/icon_znjc_bg.png


BIN
src/assets/emergencyManagement/icon_znjc_tb.png


BIN
src/assets/emergencyManagement/icon_znkz_bg.png


BIN
src/assets/emergencyManagement/icon_znkz_dy.png


BIN
src/assets/emergencyManagement/icon_znkz_tb.png


BIN
src/assets/emergencyManagement/icon_znkz_tf.png


BIN
src/assets/emergencyManagement/icon_znkz_wq.png


BIN
src/assets/emergencyManagement/icon_zou_hs.png


BIN
src/assets/emergencyManagement/icon_zuo.png


BIN
src/assets/emergencyManagement/img_bg.png


BIN
src/assets/emergencyManagement/img_bg_kd.png


BIN
src/assets/emergencyManagement/img_bg_yatk.png


BIN
src/assets/emergencyManagement/img_mhz.png


BIN
src/assets/emergencyManagement/img_yc_bg.png


BIN
src/assets/emergencyManagement/img_yh_db_zdmh.png


BIN
src/assets/emergencyManagement/img_yh_db_zdmh_yc.png


BIN
src/assets/emergencyManagement/img_yh_dd_zdmh.png


BIN
src/assets/emergencyManagement/img_yh_dd_zdmh_yc.png


BIN
src/assets/emergencyManagement/img_yh_zj_zdmh.png


BIN
src/assets/emergencyManagement/img_yh_zj_zdmh_yc.png


BIN
src/assets/emergencyManagement/img_zc_bg.png


BIN
src/assets/emergencyManagement/img_zdmh_fcjc.png


BIN
src/assets/emergencyManagement/img_zdmh_hyjc.png


BIN
src/assets/emergencyManagement/img_zdmh_qtjc.png


BIN
src/assets/emergencyManagement/img_zdmh_wsd(1).png


BIN
src/assets/emergencyManagement/img_zdmh_wsd.png


+ 0 - 0
src/assets/emergencyManagement/img_zdmh_ycbg.png


Некоторые файлы не были показаны из-за большого количества измененных файлов