更新

src/views/vent/monitorManager/alarmMonitor/DetailModalFire.vue

@@ -92,16 +92,18 @@ function btnClick(ind) {
       break;
     case 1:
       activeIndex1.value = 0;
-      menuList = menuList1.external.map(el => {
-        return {
-          name: el.systemname,
-          warn: '低风险',
-          type: 'out',
-          deviceID: el.id,
-        }
-      })
+      // menuList = menuList1.external.map(el => {
+      //   return {
+      //     name: el.systemname,
+      //     warn: '低风险',
+      //     type: 'out',
+      //     deviceID: el.id,
+      //   }
+      // })
+      menuList.length=0
       clearInterval(timer)
-      getSysWarnList(menuList[0].deviceID, 'fire');
+      current.value = ''
+      // getSysWarnList(menuList[0].deviceID, 'fire');
       break;
   }
 }
@@ -109,18 +111,6 @@ function btnClick(ind) {
 function cardClick(ind, item) {
   activeIndex1.value = ind;
   if (props.moduleName == 'fire') {
-    // switch (ind) {
-    //   case 0:
-    //     current.value = item.type == 'on' ? 'fireWork' : 'mainWell';
-    //     break;
-    //   case 1:
-    //     current.value = item.type == 'on' ? 'closeWall' : 'subStation';
-    //     // current.value = item.type == 'on' ? 'closeWall' : 'fireWork';
-    //     break;
-    //   case 2:
-    //     current.value = item.type == 'on' ? 'otherMonitor' : 'otherMonitor';
-    //     break;
-    // }
     clearInterval(timer)
     getSysWarnList(item.deviceID, 'fire');
   } else if (props.moduleName == 'vent') {
@@ -142,7 +132,8 @@ function loadZj() {
   } else if (!activeIndex.value && listData.bundletube.length != 0) {
     current.value = 'closeWall'
   } else if (activeIndex.value) {
-    current.value = 'mainWell'
+    // current.value = 'mainWell'
+    current.value = ''
   } else {
     current.value = ''
   }
@@ -220,7 +211,7 @@ function getSysWarnList(id, type) {
       }
 
     });
-  }, 1500)
+  }, 600)
 
 }
 

src/views/vent/monitorManager/alarmMonitor/fire.data.ts

@@ -10,10 +10,7 @@ export const typeMenuList = [{ name: '内因火灾' }, { name: '外因火灾' }]
 export const componentName = {
   fireWork: markRaw(defineAsyncComponent(() => import('./fire/fireWork.vue'))),
   closeWall: markRaw(defineAsyncComponent(() => import('./fire/closeWall.vue'))),
-  otherMonitor: markRaw(defineAsyncComponent(() => import('./fire/otherMonitor.vue'))),
   mainWell: markRaw(defineAsyncComponent(() => import('./fire/mainWell.vue'))),
-  subStation: markRaw(defineAsyncComponent(() => import('./fire/subStation.vue'))),
-  otherOut: markRaw(defineAsyncComponent(() => import('./fire/otherOut.vue'))),
   dustPage: markRaw(defineAsyncComponent(() => import('./fire/dustPage.vue'))),
   gasPage: markRaw(defineAsyncComponent(() => import('./fire/gasPage.vue'))),
   ventilate:markRaw(defineAsyncComponent(() => import('./fire/ventilate.vue'))),

src/views/vent/monitorManager/alarmMonitor/fire/closeWall.vue

@@ -208,10 +208,9 @@ watch(() => props.listData, (val) => {
     if (JSON.stringify(val) != '{}') {
         if (val.bundletube.length != 0) {
             topContent.temperature = val.temperature[0] ? val.temperature[0].readData.temperature : 0
-            topContent.position = val.bundletube[0].stationname
-            topContent.time = val.bundletube[0].warnTime
-            topContent.warn = val.bundletube[0].warnLevel == 0 ? '正常' : val.bundletube[0].warnLevel == 101 ? '低风险' : val.bundletube[0].warnLevel == 102 ? '中风险' : val.bundletube[0].warnLevel == 103 ? '高风险' : '报警'
-
+            topContent.position = val.bundletube[0].strinstallpos
+            topContent.time = val.bundletube[0].readTime
+            topContent.warn = val.bundletube[0].warnLevel == 0 ? '正常' : val.bundletube[0].warnLevel == 101 ? '较低风险' : val.bundletube[0].warnLevel == 102 ? '低风险' : val.bundletube[0].warnLevel == 103 ? '中风险' : val.bundletube[0].warnLevel == 104 ? '高风险' : val.bundletube[0].warnLevel == 201 ? '报警' : '正常'  
             mbList[0].nd = val.bundletube[0].readData.o2val
             mbList[1].nd = val.bundletube[0].readData.coval
             mbList[2].nd = val.bundletube[0].readData.co2val

src/views/vent/monitorManager/alarmMonitor/fire/common/echartLine.vue

@@ -35,7 +35,7 @@
       const myChart = echarts.init(line.value);
       let option = {
         grid: {
-          top: '18%',
+          top: '15%',
           left: '2%',
           bottom: '6%',
           right: '2%',
@@ -88,7 +88,7 @@
             nameTextStyle: {
               color: '#fff',
               fontSize: 12,
-              lineHeight: 15,
+              lineHeight: 10,
             },
             splitLine: {
               lineStyle: {

src/views/vent/monitorManager/alarmMonitor/fire/common/echartLine1.vue

@@ -107,7 +107,7 @@ function getOption() {
                     boundaryGap: false,
                     name: '(%)',
                     type: 'value',
-                    max: 100,
+                    max: 50,
                     axisLabel: {
                         textStyle: {
                             color: '#b3b8cc',

src/views/vent/monitorManager/alarmMonitor/fire/dustPage.vue

@@ -12,7 +12,7 @@
                 </div>
             </div>
         </div>
-        <div class="center-area">
+        <!-- <div class="center-area">
             <div class="center-t">
                 <div class="t-box" v-for="(item, index) in centerAreaListT" :key="index">
                     <div class="box-label">{{ item.label }}</div>
@@ -23,7 +23,7 @@
                     <div class="box-label">{{ item.content }}</div>
                 </div>
             </div>
-        </div>
+        </div> -->
         <div class="bot-area">
             <echartLine :echartDataGq="echartDataFc" :maxY="maxY"></echartLine>
         </div>
@@ -32,14 +32,14 @@
 
 <script lang="ts" setup>
 import { ref, computed, reactive, watch, defineProps } from 'vue';
-import { centerAreaListT, } from '../fire.data'
+// import { centerAreaListT, } from '../fire.data'
 import echartLine from './common/echartLine.vue'
 
 let props = defineProps({
     listData: Object,
 });
 
-let maxY = ref(10)
+let maxY = ref(5)
 //顶部区域数据
 let topAreaList = reactive<any[]>([])
 
@@ -93,7 +93,6 @@ watch(() => props.listData, (val) => {
     if (JSON.stringify(val.common) != '{}') {
         topAreaList.length = 0
         let dustList=val.common.dust.slice(0,3)
-        console.log(dustList,'dust------------')
         dustList.forEach(el => {
             topAreaList.push({
                 title: el.strinstallpos,
@@ -277,66 +276,67 @@ watch(() => props.listData, (val) => {
         }
     }
 
-    .center-area {
-        height: 258px;
-        margin-bottom: 20px;
-        background: url('../../../../../assets/images/fire/bj1.png') no-repeat;
-        background-size: 100% 100%;
-
-        .center-t {
-            height: 50%;
-            padding: 0px 80px;
-            display: flex;
-            justify-content: space-around;
-            align-items: center;
-            background: url('../../../../../assets/images/fire/dz.png') no-repeat;
-            background-size: 100% 100%;
-            box-sizing: border-box;
-
-            .t-box {
-                width: 218px;
-                height: 97px;
-                background: url('../../../../../assets/images/fire/dz1.png') no-repeat;
-
-                .box-label {
-                    text-align: center;
-                }
-            }
-        }
-
-        .center-b {
-            height: 50%;
-            padding: 0px 80px;
-            display: flex;
-            justify-content: space-around;
-            align-items: center;
-            box-sizing: border-box;
-
-            .b-box {
-                width: 218px;
-                height: 97px;
-                display: flex;
-                flex-direction: column;
-                justify-content: center;
-                align-items: center;
-
-                .box-label {
-                    width: 169px;
-                    height: 42px;
-                    line-height: 42px;
-                    text-align: center;
-                    margin-bottom: 5px;
-                    color: #3df6ff;
-                    font-family: 'douyuFont';
-                    background: url('../../../../../assets/images/fire/dz2.png') no-repeat;
-                }
-
-            }
-        }
-    }
+    // .center-area {
+    //     height: 258px;
+    //     margin-bottom: 20px;
+    //     background: url('../../../../../assets/images/fire/bj1.png') no-repeat;
+    //     background-size: 100% 100%;
+
+    //     .center-t {
+    //         height: 50%;
+    //         padding: 0px 80px;
+    //         display: flex;
+    //         justify-content: space-around;
+    //         align-items: center;
+    //         background: url('../../../../../assets/images/fire/dz.png') no-repeat;
+    //         background-size: 100% 100%;
+    //         box-sizing: border-box;
+
+    //         .t-box {
+    //             width: 218px;
+    //             height: 97px;
+    //             background: url('../../../../../assets/images/fire/dz1.png') no-repeat;
+
+    //             .box-label {
+    //                 text-align: center;
+    //             }
+    //         }
+    //     }
+
+    //     .center-b {
+    //         height: 50%;
+    //         padding: 0px 80px;
+    //         display: flex;
+    //         justify-content: space-around;
+    //         align-items: center;
+    //         box-sizing: border-box;
+
+    //         .b-box {
+    //             width: 218px;
+    //             height: 97px;
+    //             display: flex;
+    //             flex-direction: column;
+    //             justify-content: center;
+    //             align-items: center;
+
+    //             .box-label {
+    //                 width: 169px;
+    //                 height: 42px;
+    //                 line-height: 42px;
+    //                 text-align: center;
+    //                 margin-bottom: 5px;
+    //                 color: #3df6ff;
+    //                 font-family: 'douyuFont';
+    //                 background: url('../../../../../assets/images/fire/dz2.png') no-repeat;
+    //             }
+
+    //         }
+    //     }
+    // }
 
     .bot-area {
-        height: calc(100% - 471px);
+        // height: calc(100% - 471px);
+        height: calc(100% - 193px);
         background: url('../../../../../assets/images/fire/bj1.png') no-repeat;
         background-size: 100% 100%;
     }

src/views/vent/monitorManager/alarmMonitor/fire/otherMonitor.vue

@@ -1,55 +0,0 @@
-<template>
-    <div class="otherMonitor">
-        <div class="container">
-            <a-table ref="table" :row-selection="rowSelection" size="small" :scroll="monitorscroll2" :columns="columnsOther"
-                :data-source="monitorlist" :pagination="false" :loading="loading">
-                <span slot="action" slot-scope="text, record">
-
-                </span>
-            </a-table>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, ref, computed, defineEmits, reactive, onUnmounted, watch, markRaw, defineAsyncComponent } from 'vue';
-import {columnsOther} from '../fire.data'
-
-//滚动条
-let monitorscroll2 = reactive({ y: 'calc(100% - 150px)' })
-
-//table列表
-let monitorlist = reactive([])
-//table加载状态
-let loading = ref(false)
-//table选中的数据
-let selectedRow = reactive([])
-//table复选框选择
-let rowSelection = computed(() => {
-    return {
-        onChange: (selectedRowKeys, selectedRows) => {
-            selectedRow = selectedRows
-            console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRow)
-        },
-        getCheckboxProps: (record) => ({
-            props: {
-                realId: record.realId,
-            },
-        }),
-    }
-})
-
-</script>
-
-<style lang="less" scoped>
-.otherMonitor {
-    width: 100%;
-    height: 100%;
-    padding: 20px;
-    box-sizing: border-box;
-
-    .container {
-        height: 100%;
-    }
-}
-</style>

src/views/vent/monitorManager/alarmMonitor/fire/otherOut.vue

@@ -1,221 +0,0 @@
-<template>
-    <div class="otherOut">
-        <div class="title">
-            <div :class="active == true ? 'btn1' : 'btn'" @click="btnClick">井下消防材料库</div>
-        </div>
-        <div class="content">
-            <div class="content-tab" v-for="(item, index) in tabList1" :key="index">
-                <div class="title">
-                    <span class="label">{{ item.label }}</span>
-                    <span class="details">{{ `${item.details}>>` }}</span>
-                </div>
-                <div class="content-item" v-if="index == 0">
-                    <a-table ref="table" :row-selection="rowSelectionWd" size="small" :scroll="monitorscroll2"
-                        :columns="columnWd" :data-source="monitorlistWd" :pagination="false" :loading="loading">
-                        <span slot="action" slot-scope="text, record"> </span>
-                    </a-table>
-                </div>
-                <div class="content-item" v-if="index == 1">
-                    <a-table ref="table1" :row-selection="rowSelectionJj" size="small" :scroll="monitorscroll2"
-                        :columns="columnsJj" :data-source="monitorlistJj" :pagination="false" :loading="loading">
-                        <span slot="action" slot-scope="text, record"> </span>
-                    </a-table>
-                </div>
-                <div class="content-item" v-if="index == 2">
-                    <a-table ref="table2" :row-selection="rowSelectionYw" size="small" :scroll="monitorscroll2"
-                        :columns="columnsYw" :data-source="monitorlistYw" :pagination="false" :loading="loading">
-                        <span slot="action" slot-scope="text, record"> </span>
-                    </a-table>
-                </div>
-                <div class="content-item" v-if="index == 3">
-                    <a-table ref="table3" :row-selection="rowSelectionJd" size="small" :scroll="monitorscroll2"
-                        :columns="columnsJd" :data-source="monitorlistJd" :pagination="false" :loading="loading">
-                        <span slot="action" slot-scope="text, record"></span>
-                    </a-table>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, ref, defineEmits, computed, reactive, onUnmounted, watch, markRaw, defineAsyncComponent } from 'vue';
-import { tabList1, columnWd, columnsJj, columnsYw, columnsJd } from '../fire.data'
-
-let active = ref(false) //井下消防材料库按钮切换
-//滚动条高度
-let monitorscroll2 = reactive({ y: 'calc(100% - 150px)' })
-//列表加载状态
-let loading = ref(false)
-
-
-//综采温度table列表
-let monitorlistWd = reactive([])
-//综采温度当前选中数据
-let selectedRow = reactive([])
-//综采温度-多选操作
-let rowSelectionWd = computed(() => {
-    return {
-        onChange: (selectedRowKeys, selectedRows) => {
-            selectedRow = selectedRows
-            console.log(`selectedRowKeys: ${selectedRowKeys}`, '综采温度: ', selectedRow)
-        },
-        getCheckboxProps: (record) => ({
-            props: {
-                realId: record.realId,
-            },
-        }),
-    }
-})
-
-//掘进监测table列表
-let monitorlistJj = reactive([])
-
-//掘进监测当前选中数据
-let selectedRowJj = reactive([])
-//掘进监测-多选操作
-let rowSelectionJj = computed(() => {
-    return {
-        onChange: (selectedRowKeys, selectedRows) => {
-            selectedRowJj = selectedRows
-            console.log(`selectedRowKeys: ${selectedRowKeys}`, '掘进监测: ', selectedRowJj)
-        },
-        getCheckboxProps: (record) => ({
-            props: {
-                realId: record.realId,
-            },
-        }),
-    }
-})
-
-
-//运输烟雾table列表
-let monitorlistYw = reactive([])
-
-//运输烟雾当前选中数据
-let selectedRowYw = reactive([])
-//运输烟雾-多选操作
-let rowSelectionYw = computed(() => {
-    return {
-        onChange: (selectedRowKeys, selectedRows) => {
-            selectedRowYw = selectedRows
-            console.log(`selectedRowKeys: ${selectedRowKeys}`, '运输烟雾: ', selectedRowYw)
-        },
-        getCheckboxProps: (record) => ({
-            props: {
-                realId: record.realId,
-            },
-        }),
-    }
-})
-
-
-//机电硐室table列表
-let monitorlistJd = reactive([])
-//机电硐室当前选中数据
-let selectedRowJd = reactive([])
-//机电硐室-多选操作
-let rowSelectionJd = computed(() => {
-    return {
-        onChange: (selectedRowKeys, selectedRows) => {
-            selectedRowJd = selectedRows
-            console.log(`selectedRowKeys: ${selectedRowKeys}`, '机电硐室: ', selectedRowJd)
-        },
-        getCheckboxProps: (record) => ({
-            props: {
-                realId: record.realId,
-            },
-        }),
-    }
-})
-
-function btnClick() {
-    active.value = !active.value
-}
-
-</script>
-
-<style lang="less" scoped>
-.otherOut {
-    width: 100%;
-    height: 100%;
-    padding: 20px;
-    box-sizing: border-box;
-
-    .title {
-        height: 42px;
-        display: flex;
-        justify-content: flex-end;
-
-        .btn {
-            width: 120px;
-            height: 42px;
-            line-height: 42px;
-            text-align: center;
-            font-size: 14px;
-            color: #fff;
-            cursor: pointer;
-            background: url('../../../../../assets/images/fire/btn.png') no-repeat;
-            background-size: 100%;
-        }
-
-        .btn1 {
-            width: 120px;
-            height: 42px;
-            line-height: 42px;
-            text-align: center;
-            font-size: 14px;
-            color: #fff;
-            cursor: pointer;
-            background: url('../../../../../assets/images/fire/btn1.png') no-repeat;
-            background-size: 100% 100%;
-        }
-    }
-
-    .content {
-        height: calc(100% - 42px);
-        display: flex;
-        justify-content: flex-start;
-        align-items: flex-start;
-        flex-wrap: wrap;
-
-        .content-tab {
-            width: calc(50% - 20px);
-            height: calc(50% - 20px);
-            margin: 10px;
-            background: url('../../../../../assets/images/fire/bj1.png') no-repeat;
-            background-size: 100% 100%;
-
-            .title {
-                width: 100%;
-                height: 40px;
-                padding: 0px 15px;
-                margin-bottom: 10px;
-                border-bottom: 1px solid #0c3c88;
-                box-sizing: border-box;
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-
-                .label {
-                    // font-family: 'douyuFont';
-                    font-size: 16px;
-                    color: #fff;
-                }
-
-                .details {
-                    font-size: 14px;
-                    color: #1f81df;
-                }
-            }
-
-            .content-item {
-                height: calc(100% - 60px);
-                margin-bottom: 10px;
-                overflow: hidden;
-                overflow-y: auto;
-            }
-        }
-    }
-}
-</style>

src/views/vent/monitorManager/alarmMonitor/fire/subStation.vue

@@ -1,229 +0,0 @@
-<template>
-    <div class="subStation">
-        <div class="title">
-            <div class="label">{{ `风险${warningLevel} : ${predictMsg}` }}</div>
-            <div :class="active ? 'btn1' : 'btn'" @click="btnClick">井下消防材料库</div>
-        </div>
-        <div class="content">
-            <div class="box" v-for="(item, index) in dataList" :key="index">
-                <div class="top-box">
-                    <div class="left">{{ item.fq }}</div>
-                    <div class="right">
-                        <span class="label">{{ item.label }}</span>
-                        <span class="value">{{ item.value }}</span>
-                    </div>
-                    <div class="right1">{{ item.btnText }}</div>
-                </div>
-                <div class="bot-box">
-                    <div class="content" v-for="(items, ind) in item.contentList" :key="ind">
-                        <div class="bg1">
-                            <img :src="items.imgSrc" alt="" />
-                            <div class="conts">
-                                <span class="text">{{ items.label }}</span>
-                                <span class="text1">{{ items.value }}</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, ref, defineEmits, computed, reactive, onUnmounted, watch, markRaw, defineAsyncComponent } from 'vue';
-import { dataList } from '../fire.data'
-
-//风险等级
-let warningLevel = ref(0)
-//风险等级描述
-let predictMsg = ref('')
-let active = ref(false)
-
-
-//井下消防材料库点击切换
-function btnClick() {
-    active.value = true
-}
-
-</script>
-
-<style lang="less" scoped>
-.subStation {
-    width: 100%;
-    height: 100%;
-    padding: 20px;
-    box-sizing: border-box;
-
-    .title {
-        width: 100%;
-        height: 50px;
-        padding: 0px 30px;
-        box-sizing: border-box;
-        margin-bottom: 20px;
-        background: url('../../../../../assets/images/fire/bj1.png') no-repeat;
-        background-size: 100% 100%;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-
-        .label {
-            font-size: 18px;
-            color: #b3b8cc;
-            font-weight: bold;
-        }
-
-        .btn {
-            width: 120px;
-            height: 36px;
-            line-height: 36px;
-            text-align: center;
-            font-size: 14px;
-            color: #fff;
-            background: url('../../../../../assets/images/fire/btn.png') no-repeat;
-            background-size: 100% 100%;
-            cursor: pointer;
-        }
-
-        .btn1 {
-            width: 120px;
-            height: 36px;
-            line-height: 36px;
-            text-align: center;
-            font-size: 14px;
-            color: #fff;
-            background: url('../../../../../assets/images/fire/btn1.png') no-repeat;
-            background-size: 100% 100%;
-            cursor: pointer;
-        }
-    }
-
-    .content {
-        height: calc(100% - 70px);
-        display: flex;
-        justify-content: flex-start;
-        align-items: flex-start;
-        flex-wrap: wrap;
-
-        .box {
-            width: 502px;
-            height: 210px;
-            margin: 10px;
-            background: url('../../../../../assets/images/fire/card.png') no-repeat;
-            background-size: 100% 100%;
-
-            .top-box {
-                position: relative;
-                height: 54px;
-                display: flex;
-                justify-content: flex-start;
-                align-items: center;
-
-                .left {
-                    width: 152px;
-                    height: 36px;
-                    line-height: 36px;
-                    padding-left: 20px;
-                    box-sizing: border-box;
-                    font-family: 'douyuFont';
-                    font-size: 14px;
-                    color: #3df6ff;
-                    background: url('../../../../../assets/images/fire/14.png') no-repeat;
-                }
-
-                .right {
-                    position: absolute;
-                    right: 128px;
-                    top: 50%;
-                    transform: translate(0, -50%);
-                    width: 120px;
-                    height: 36px;
-                    display: flex;
-                    justify-content: space-around;
-                    align-items: center;
-                    background: url('../../../../../assets/images/fire/bj1.png') no-repeat;
-                    background-size: 100% 100%;
-
-                    .label {
-                        color: #fff;
-                        font-size: 14px;
-                    }
-
-                    .value {
-                        color: #3df6ff;
-                        font-size: 14px;
-                    }
-                }
-
-                .right1 {
-                    position: absolute;
-                    right: 10px;
-                    top: 50%;
-                    transform: translate(0, -50%);
-                    width: 100px;
-                    height: 36px;
-                    line-height: 36px;
-                    text-align: center;
-                    color: #fff;
-                    font-size: 14px;
-                    background: url('../../../../../assets/images/fire/btn.png') no-repeat;
-                    cursor: pointer;
-                }
-            }
-
-            .bot-box {
-                height: calc(100% - 54px);
-                padding: 15px;
-                box-sizing: border-box;
-                display: flex;
-                justify-content: flex-start;
-                align-items: flex-start;
-                flex-wrap: wrap;
-
-                .content {
-                    width: 50%;
-                    height: 50%;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-
-                    .bg1 {
-                        position: relative;
-                        width: 232px;
-                        height: 50px;
-                        background: url('../../../../../assets/images/fire/bg-s.png') no-repeat;
-
-                        img {
-                            width: 18px;
-                            height: 18px;
-                            position: absolute;
-                            left: 19px;
-                            top: 10px;
-                        }
-
-                        .conts {
-                            position: absolute;
-                            left: 55px;
-                            top: 25px;
-                            width: 168px;
-                            height: 24px;
-                            display: flex;
-                            justify-content: space-between;
-
-                            .text {
-                                font-size: 14px;
-                                color: #fff;
-                            }
-
-                            .text1 {
-                                font-size: 14px;
-                                color: #3df6ff;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-</style>

src/views/vent/monitorManager/alarmMonitor/fire/ventilate.vue

@@ -85,7 +85,7 @@ watch(
           topAreaList.push({
             title: el.typeName,
             content: [
-              { ids: 0, label: '设备类型', value: el.datalist[0].typeName },
+              { ids: 0, label: '设备类型', value: '工作面风量' },
               {
                 ids: 1,
                 label: '报警等级',
@@ -99,7 +99,7 @@ watch(
         topAreaList.push({
           title: '工作面',
           content: [
-            { ids: 0, label: '设备类型', value: '--' },
+            { ids: 0, label: '设备类型', value: '工作面风量' },
             {
               ids: 1,
               label: '报警等级',
@@ -111,9 +111,9 @@ watch(
 
       }
 
-      centerAreaListB1[0].content = val.common.jin;
-      centerAreaListB1[1].content = val.common.hui;
-      centerAreaListB1[2].content = val.common.xufengliang;
+      centerAreaListB1[0].content = val.common.jin || '/';
+      centerAreaListB1[1].content = val.common.hui || '/';
+      centerAreaListB1[2].content = val.common.xufengliang || '/';
 
       val.common.history.forEach((v) => {
         echartDataFc1.maxData.data.push(parseFloat(v.jin));