Explorar o código

feat:智慧消防弹窗,风险预警地图弹窗

LAPTOP-U5GOA5HA\zz hai 1 ano
pai
achega
26e27a5e18

+ 6 - 0
app/src/api/iot.js

@@ -163,3 +163,9 @@ export function getChartMapData(params) {
     params,
   });
 }
+export function getzhxfSelect() {
+  return request({
+    url: "/system/xz/zhxf/select",
+    method: "get",
+  });
+}

BIN=BIN
app/src/assets/images/fxyj33.png


BIN=BIN
app/src/assets/images/fxyjj.png


+ 4 - 6
app/src/views/Home/components/MapChartsCategory.vue

@@ -1,12 +1,10 @@
 <template>
   <div style="position: relative; width: 100%; height: 95%;">
     <div class="map-box" ref="map"></div>
-    <img src="../../../assets/images/dd_wh.png" alt="" @click="getShoeInfo('whFxModal')">
+    <img class="imgs" src="../../../assets/images/dd_wh.png" alt="" @click="getShoeInfo('whFxModal')">
     <basic-modal top="30px" ref="whFxModal" name="区域高层建筑消防安全风险分色判定标准" width="90%">
-      <div style="display: flex; justify-content: center">
-        <!-- <img src="../../assets/images/dd-exp-fx.png" /> -->
-        <div v-html="textInfo"></div>
-      </div>
+        <img src="../../../assets/images/fxyjj.png" />
+        <!-- <div v-html="textInfo"></div> -->
     </basic-modal>
   </div>
   <!-- 风险问号弹窗 -->
@@ -684,7 +682,7 @@ export default {
   height: 632px;
   /* background: blue; */
 }
-img{
+.imgs{
  position: absolute;
  right: 60px;
  bottom: 150px;

+ 4 - 4
app/src/views/Home/index.vue

@@ -80,8 +80,8 @@
       <!-- 风险问号弹窗 -->
       <basic-modal top="30px" ref="whFxModal" name="高层建筑消防安全风险分级分色判定标准" width="90%">
       <div style="display: flex; flex-direction: column; justify-content: center">
-        <img class="imgs" src="../../assets/images/qxs.png" />
-        <div v-html="textInfo"></div>
+        <img class="imgs" src="../../assets/images/fxyj33.png" />
+        <!-- <div v-html="textInfo"></div> -->
       </div>
     </basic-modal>
   </div>
@@ -797,7 +797,7 @@ export default {
 }
 .imgs{
   display: inline-block;
-  width: 100%;
-  height: 700px;
+  /* width: 100%;
+  height: 700px; */
 }
 </style>

+ 43 - 36
app/src/views/Iot/components/fxfbCont.vue

@@ -1,6 +1,6 @@
 <script>
 import { getGcjztjUnit } from "@/api/index.js";
-import { getZhxf } from "@/api/iot.js";
+import { getZhxf,getzhxfSelect } from "@/api/iot.js";
 import { area } from "@/api/area";
 import punishmentMixin from "@/mixin/unit.js";
 export default {
@@ -46,38 +46,38 @@ export default {
       ],
       // 告警状态
       DeviceStatusList: [
-        {
-          value: "消音,手动报警,查岗应答",
-          label: "消音,手动报警,查岗应答",
-        },
-        {
-          value: "压力下线报警,电源正常,无故障",
-          label: "压力下线报警,电源正常,无故障",
-        },
-        {
-          value: "压力上线报警",
-          label: "压力上线报警",
-        },
-        {
-          value: "火警",
-          label: "火警",
-        },
-        {
-          value: "停车侦测",
-          label: "停车侦测",
-        },
-        {
-          value: "人员离岗",
-          label: "人员离岗",
-        },
-        {
-          value: "机动车违停",
-          label: "机动车违停",
-        },
-        {
-          value: "区域内人数报警",
-          label: "区域内人数报警",
-        },
+        // {
+        //   value: "消音,手动报警,查岗应答",
+        //   label: "消音,手动报警,查岗应答",
+        // },
+        // {
+        //   value: "压力下线报警,电源正常,无故障",
+        //   label: "压力下线报警,电源正常,无故障",
+        // },
+        // {
+        //   value: "压力上线报警",
+        //   label: "压力上线报警",
+        // },
+        // {
+        //   value: "火警",
+        //   label: "火警",
+        // },
+        // {
+        //   value: "停车侦测",
+        //   label: "停车侦测",
+        // },
+        // {
+        //   value: "人员离岗",
+        //   label: "人员离岗",
+        // },
+        // {
+        //   value: "机动车违停",
+        //   label: "机动车违停",
+        // },
+        // {
+        //   value: "区域内人数报警",
+        //   label: "区域内人数报警",
+        // },
       ],
       fxdjList: [],
       tableData: [],
@@ -143,7 +143,7 @@ export default {
         gcjzmc: this.search,
         zt: this.gjzt, //设备状态
         sblx: this.sblx,
-        ywzt: this.ywzt.join("/"), //告警状态
+        ywzt: this.ywzt?.join("@"), //告警状态
         ...this.params,
       }).then((res) => {
         this.tableData = res.data.rows;
@@ -166,6 +166,12 @@ export default {
         const list = res.data.rows[0];
       });
     },
+    // 告警类型
+    fnGjType(){
+      getzhxfSelect().then(res=>{
+        this.DeviceStatusList=res.data.data
+      })
+    },
     resetForm() {
       this.value = "";
       this.search = "";
@@ -190,6 +196,7 @@ export default {
     }).then((res) => {
       this.options = res.data.rows;
     });
+    this.fnGjType()
   },
 };
 </script>
@@ -244,8 +251,8 @@ export default {
             style="height: 30px"
           >
             <el-option
-              :value="item.value"
-              :label="item.lable"
+              :value="item.warning_type"
+              :label="item.warning_type"
               v-for="(item, index) in DeviceStatusList"
               :key="index"
             >