Quellcode durchsuchen

预警管控修改-提交

lxh vor 9 Monaten
Ursprung
Commit
e6c1eb3016

+ 1 - 1
.env.development

@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理,您可以配置多个 ,请注意,没有换行符
 #VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY = [["/jeecgsystem","http://10.10.150.72:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
+VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
 #VITE_PROXY = [["/jeecgsystem","http://192.168.1.8:9999"],["/upload","http://localhost:3300/upload"]]
 
 # 控制台不输出

+ 1 - 0
package.json

@@ -84,6 +84,7 @@
     "vue-print-nb-jeecg": "^1.0.12",
     "vue-router": "^4.2.4",
     "vue-types": "^5.1.1",
+    "vue3-seamless-scroll": "^2.0.1",
     "vuedraggable": "^4.1.0",
     "vxe-table": "4.5.12",
     "vxe-table-plugin-antd": "3.1.0",

BIN
src/assets/images/fire/ceshi.png


+ 1 - 52
src/views/vent/monitorManager/alarmMonitor/alarm.data.ts

@@ -607,55 +607,4 @@ export const fireMonitor = [
   //   value: 0,
   // },
 ];
-export const fireMonitor1 = [
-  // {
-  //   title: '最高温度(℃)',
-  //   code: '',
-  //   value: 0,
-  // },
-  // {
-  //   title: '火焰传感器',
-  //   code: '',
-  //   value: '报警',
-  // },
-  // {
-  //   title: '烟雾传感器',
-  //   code: '',
-  //   value: '报警',
-  // },
-  // {
-  //   title: '喷淋装置',
-  //   code: '',
-  //   value: '未接入',
-  // },
-  {
-    title: 'CO最大值(ppm)',
-    code: '',
-    level: null,
-    value: 0,
-  },
-  {
-    title: 'CH₄最大值(%)',
-    code: '',
-    level: null,
-    value: 0,
-  },
-  {
-    title: 'C₂H₄最大值(ppm)',
-    code: '',
-    level: null,
-    value: 0,
-  },
-  {
-    title: 'CO₂最大值(%)',
-    code: '',
-    level: null,
-    value: 0,
-  },
-  {
-    title: '上隅角O₂最小值(%)',
-    code: '',
-    level: null,
-    value: 0,
-  },
-];
+

+ 135 - 41
src/views/vent/monitorManager/alarmMonitor/common/closeWall.vue

@@ -19,7 +19,44 @@
         </div>
       </div>
       <div class="box-container">
-        <div class="text1">{{ topContent.warn }}</div>
+        <div class="text1">
+          <span>预警等级 : </span>
+          <span :class="{
+            value1: topContent.warn == '1',
+            value2: topContent.warn == '2',
+            value3: topContent.warn == '3',
+            value4: topContent.warn == '4',
+            value5: topContent.warn == '5',
+            value6: topContent.warn == '6',
+          }">{{ topContent.warn == '1'
+            ? '正常'
+            : topContent.warn == '2'
+              ? '低风险'
+              : topContent.warn == '3'
+                ? '一般风险'
+                : topContent.warn == '4'
+                  ? '较高风险'
+                  : topContent.warn == '5'
+                    ? '高风险'
+                    : topContent.warn == '6'
+                      ? '报警' : '--' }}</span>
+        </div>
+        <div class="text1">
+          <span>煤自燃阶段 : </span>
+          <span>{{ topContent.warn == '1'
+            ? '氧化阶段'
+            : topContent.warn == '2'
+              ? '自热阶段'
+              : topContent.warn == '3'
+                ? '临界阶段'
+                : topContent.warn == '4'
+                  ? '热解阶段'
+                  : topContent.warn == '5'
+                    ? '裂变阶段'
+                    : topContent.warn == '6'
+                      ? '燃烧阶段' : '--' }}</span>
+        </div>
+
       </div>
     </div>
     <div class="content">
@@ -46,12 +83,19 @@
         </div>
       </div>
       <div class="echart-box">
-        <div class="title-f">
-          <div class="title-text">{{ `${type}趋势` }}</div>
+        <div class="left-echartbox">
+          <div class="title-f">
+            <div class="title-text">{{ `${type}趋势` }}</div>
+          </div>
+          <div class="echarts-box">
+            <echartLine1 :echartDataSg="echartDataSg1" :lengedDataName="echartDataSg1.lengedDataName" />
+          </div>
         </div>
-        <div class="echarts-box">
-          <echartLine1 :echartDataSg="echartDataSg1" :lengedDataName="echartDataSg1.lengedDataName" />
+        <div class="right-echartbox">
+          <canvasZb :widthV="widthV" :heightV="heightV" :coordDw="coordDw" :widthCanvas="widthCanvas"
+            :heightCanvas="heightCanvas"></canvasZb>
         </div>
+
       </div>
     </div>
   </div>
@@ -60,11 +104,17 @@
 <script lang="ts" setup>
 import { onMounted, ref, reactive, watch, defineProps } from 'vue';
 import echartLine1 from './echartLine1.vue';
+import canvasZb from './canvasZb.vue'
 
 let props = defineProps({
   listData: Object,
 });
 
+let widthV = ref('75%')
+let heightV = ref('80%')
+let coordDw = ref<any[]>([26, 46, 80, 128, 190, 260,])
+let widthCanvas = ref(562)
+let heightCanvas = ref(316)
 //密闭-顶部区域数据
 let topContent = reactive({
   temperature: 0,
@@ -210,22 +260,7 @@ watch(
         topContent.temperature = val.temperature[0] ? val.temperature[0].readData.temperature : '--';
         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
-                      ? '报警'
-                      : val.bundletube[0].warnLevel == 1001
-                        ? '网络异常'
-                        : '正常';
+        topContent.warn = val.bundletube[0].readData.internalFireWarnLevel
         mbList[0].nd = val.bundletube[0].readData.o2val || '--';
         mbList[1].nd = val.bundletube[0].readData.coval || '--';
         mbList[2].nd = val.bundletube[0].readData.co2val || '--';
@@ -258,7 +293,7 @@ watch(
         topContent.temperature = 0;
         topContent.position = '--';
         topContent.time = '--';
-        topContent.warn = '正常';
+        topContent.warn = '--';
         mbList[0].nd = '--';
         mbList[1].nd = '--';
         mbList[2].nd = '--';
@@ -296,6 +331,7 @@ watch(
     .box-container {
       display: flex;
 
+
       &:nth-child(1) {
         justify-content: space-around;
         align-items: center;
@@ -306,10 +342,11 @@ watch(
       }
 
       &:nth-child(2) {
+        flex-direction: column;
         flex: 1;
-        justify-content: center;
+        justify-content: space-around;
         align-items: center;
-        height: 100%;
+        height: 73%;
       }
 
       .contents {
@@ -366,9 +403,50 @@ watch(
       }
 
       .text1 {
-        font-size: 16px;
+        width: 50%;
+        height: 30px;
+        line-height: 30px;
+        font-size: 14px;
         color: #b3b8cc;
         font-weight: bold;
+
+        span {
+          display: inline-block;
+
+          &:nth-child(1) {
+            width: 120px;
+            text-align: right;
+          }
+
+          &:nth-child(2) {
+            font-family: 'douyuFont';
+            color: #3df6ff;
+            margin-left: 10px;
+          }
+        }
+        .value1 {
+         color: rgb(145, 230, 9) !important;
+       }
+
+       .value2 {
+         color: rgb(0, 242, 255) !important;
+       }
+
+       .value3 {
+         color: #ffff35 !important;
+       }
+
+       .value4 {
+         color: #ffbe69 !important;
+       }
+
+       .value5 {
+         color: #ff6f00 !important;
+       }
+
+       .value6 {
+         color: #ff0000 !important;
+       }
       }
     }
   }
@@ -514,28 +592,44 @@ watch(
     }
 
     .echart-box {
+      display: flex;
       height: calc(72% - 41px);
-      border: 1px solid #114aac;
-
-      .title-f {
-        height: 40px;
-        padding: 0px 10px;
-        box-sizing: border-box;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
 
-        .title-text {
-          font-family: 'douyuFont';
-          font-size: 14px;
-          color: #fff;
-          // color: #3df6ff;
+
+      .left-echartbox {
+        width: calc(50% - 6px);
+        margin-right: 6px;
+        border: 1px solid #114aac;
+        border-radius: 5px;
+
+        .title-f {
+          height: 40px;
+          padding: 0px 10px;
+          box-sizing: border-box;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+
+          .title-text {
+            font-family: 'douyuFont';
+            font-size: 14px;
+            color: #fff;
+            // color: #3df6ff;
+          }
+        }
+
+        .echarts-box {
+          height: calc(100% - 40px);
         }
       }
 
-      .echarts-box {
-        height: calc(100% - 40px);
+      .right-echartbox {
+        width: calc(50% - 6px);
+        margin-left: 6px;
+        border: 1px solid #114aac;
+        border-radius: 5px;
       }
+
     }
   }
 }

+ 67 - 434
src/views/vent/monitorManager/alarmMonitor/common/warnTargetFire.vue

@@ -1,463 +1,81 @@
 <template>
     <div class="warnTargetFire">
-        <a-table :columns="columns" :data-source="tableData" bordered :pagination="false" :scroll="{ y: 720 }">
-            <template #bodyCell="{ column, text }">
-                <template v-if="column.dataIndex === 'name'">
-                    <a href="javascript:;">{{ text }}</a>
+        <div class="top-area">
+            <a-table :columns="columns" :data-source="tableData" bordered :pagination="false" :scroll="{ y: 374 }">
+                <template #bodyCell="{ column, text }">
+                    <template v-if="column.dataIndex === 'name'">
+                        <a href="javascript:;">{{ text }}</a>
+                    </template>
                 </template>
-            </template>
-        </a-table>
+            </a-table>
+        </div>
+        <div class="bot-area">
+            <canvasZb :widthV="widthV" :heightV="heightV" :coordDw="coordDw" :widthCanvas="widthCanvas"
+                :heightCanvas="heightCanvas"></canvasZb>
+        </div>
+
     </div>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
+import canvasZb from './canvasZb.vue'
 
+let widthV = ref('80%')
+let heightV = ref('80%')
+let coordDw = ref<any[]>([9, 30, 64, 110, 170, 204,])
+let widthCanvas = ref(1508)
+let heightCanvas = ref(270)
 let tableData = ref<any[]>([
-    {
-        key: '1',
-        one: '回风测氧化带CO浓度',
-        two: '一级预警',
-        three: 'CO>60ppm',
-    },
-    {
-        key: '2',
-        one: '回风测氧化带CO浓度',
-        two: '二级预警',
-        three: '240ppm>CO>60ppm',
+    { yjdj: '灰色预警', zrjd: '氧化阶段', zb: 'CO,O₂', tj: '当O₂浓度为8%~15%时CO<200ppm;当O₂浓度为15%~18%时,CO<100ppm;当O₂浓度为时,CO<50ppm',wd:'T0⊂(30,50)', ckz: '' },
+    { yjdj: '蓝色预警', zrjd: '自热阶段', zb: 'CO,O₂,(CO*100)/△O₂', tj: '超过氧化阶段条件',wd:'T0⊂(50,70)', ckz: '0.2~0.5' },
+    { yjdj: '黄色预警', zrjd: '临界阶段', zb: 'CO,O₂,(CO*100)/△O₂', tj: '超过自热阶段条件',wd:'T0⊂(70,100)', ckz: '0.5-0.6' },
+    { yjdj: '橙色预警', zrjd: '热解阶段', zb: '(CO*100)/△O2,C₂H₄', tj: '超过临界阶段条件',wd:'T0⊂(100,150)', ckz: '>0.6>0' },
+    { yjdj: '红色预警', zrjd: '裂变阶段', zb: 'C₂H₄,C₂H₆,C₂H₄', tj: '超过热解阶段条件',wd:'T0⊂(150,210)', ckz: '>0极大' },
+    { yjdj: '黑色预警', zrjd: '燃烧阶段', zb: 'C2H₂', tj: '超过裂变阶段条件',wd:'T0>210', ckz: '>0' },
+])
+
+let columns = reactive([
 
-    },
-    {
-        key: '3',
-        one: '回风测氧化带CO浓度',
-        two: '三级预警',
-        three: 'CO>240ppm',
-    },
-    {
-        key: '4',
-        one: '回风测氧化带CO浓度',
-        two: '四级预警',
-        three: 'CO>1000ppm',
-    },
-    {
-        key: '5',
-        one: '回风测氧化带氧温度',
-        two: '一级预警',
-        three: '温度>40℃',
-    },
-    {
-        key: '6',
-        one: '回风测氧化带氧温度',
-        two: '二级预警',
-        three: '70℃<温度<40℃',
-    },
-    {
-        key: '7',
-        one: '回风测氧化带氧温度',
-        two: '三级预警',
-        three: '70℃<温度<210℃',
-    },
-    {
-        key: '8',
-        one: '回风测氧化带氧温度',
-        two: '四级预警',
-        three: '温度>210℃',
-    },
-    {
-        key: '9',
-        one: '回风隅角CO浓度',
-        two: '一级预警',
-        three: 'CO>24ppm',
-    },
-    {
-        key: '10',
-        one: '回风隅角CO浓度',
-        two: '二级预警',
-        three: 'CO>100ppm',
-    },
-    {
-        key: '11',
-        one: '回风隅角CO浓度',
-        two: '三级预警',
-        three: 'CO>160ppm',
-    },
-    {
-        key: '12',
-        one: '回风隅角CO浓度',
-        two: '四级预警',
-        three: 'CO>200ppm',
-    },
-    {
-        key: '13',
-        one: '回风隅角气体温度',
-        two: '一级预警',
-        three: '温度>33℃',
-    },
-    {
-        key: '14',
-        one: '回风隅角气体温度',
-        two: '二级预警',
-        three: '温度>40℃',
-    },
-    {
-        key: '15',
-        one: '回风隅角气体温度',
-        two: '三级预警',
-        three: '温度>50℃',
-    },
-    {
-        key: '16',
-        one: '回风隅角气体温度',
-        two: '四级预警',
-        three: '温度>60℃',
-    },
-    {
-        key: '17',
-        one: '回风流CO浓度',
-        two: '一级预警',
-        three: 'CO>12ppm',
-    },
-    {
-        key: '18',
-        one: '回风流CO浓度',
-        two: '二级预警',
-        three: 'CO>24ppm',
-    },
-    {
-        key: '19',
-        one: '回风流CO浓度',
-        two: '三级预警',
-        three: 'CO>40ppm',
-    },
-    {
-        key: '20',
-        one: '回风流CO浓度',
-        two: '四级预警',
-        three: 'CO>70ppm',
-    },
-    {
-        key: '21',
-        one: '回风流巷道气体温度',
-        two: '一级预警',
-        three: '温度>30℃',
-    },
-    {
-        key: '22',
-        one: '回风流巷道气体温度',
-        two: '二级预警',
-        three: '温度>35℃',
-    },
-    {
-        key: '23',
-        one: '回风流巷道气体温度',
-        two: '三级预警',
-        three: '温度>45℃',
-    },
-    {
-        key: '24',
-        one: '回风流巷道气体温度',
-        two: '四级预警',
-        three: '温度>70℃',
-    },
-    {
-        key: '25',
-        one: '回风测氧化带C2H4浓度',
-        two: '三级预警',
-        three: 'C2H4>0pmm',
-    },
-    {
-        key: '26',
-        one: '回风测氧化带C2H2浓度',
-        two: '四级预警',
-        three: 'C2H2>0pmm',
-    },
-    {
-        key: '27',
-        one: '回风测氧化带100*CO/O2',
-        two: '一级预警',
-        three: '0.2~0.5',
-    },
-    {
-        key: '28',
-        one: '回风测氧化带100*CO/O2',
-        two: '二级预警',
-        three: '>0.5',
-    },
-    {
-        key: '29',
-        one: '回风测氧化带100*CO/O2',
-        two: '三级预警',
-        three: '无限大,出现C2H4',
-    },
-    {
-        key: '30',
-        one: '回风测氧化带100*CO/O2',
-        two: '四级预警',
-        three: '无限大,出现C2H2',
-    },
-    {
-        key: '31',
-        one: '回风测氧化带O2浓度',
-        two: '一级预警',
-        three: '7%>CO>5%',
-    },
-    {
-        key: '32',
-        one: '回风测氧化带O2浓度',
-        two: '二级预警',
-        three: '10%>CO>7%',
-    },
-    {
-        key: '33',
-        one: '回风测氧化带O2浓度',
-        two: '三级预警',
-        three: '18%>CO>12%',
-    },
-    {
-        key: '34',
-        one: '回风测氧化带O2浓度',
-        two: '四级预警',
-        three: 'CO>18%',
-    },
-    {
-        key: '35',
-        one: '月推进度',
-        two: '一级预警',
-        three: 'LS<0.95LX',
-    },
-    {
-        key: '36',
-        one: '月推进度',
-        two: '二级预警',
-        three: 'LS<0.9LX',
-    },
-    {
-        key: '37',
-        one: '月推进度',
-        two: '三级预警',
-        three: 'LS<0.85LX',
-    },
-    {
-        key: '38',
-        one: '月推进度',
-        two: '四级预警',
-        three: 'LS<0.8LX',
-    },
-    {
-        key: '39',
-        one: '皮带最高火灾温度',
-        two: '一级预警',
-        three: '3.5Rp>Rs>1.5Rp',
-    },
-    {
-        key: '40',
-        one: '皮带最高火灾温度',
-        two: '二级预警',
-        three: '6Rp>Rs>3.5Rp',
-    },
-    {
-        key: '41',
-        one: '皮带最高火灾温度',
-        two: '三级预警',
-        three: 'Rs>Rr>6Rp',
-    },
-    {
-        key: '42',
-        one: '皮带最高火灾温度',
-        two: '四级预警',
-        three: 'Rs>Rs',
-    },
     {
-        key: '43',
-        one: '电缆火灾最高温度',
-        two: '一级预警',
-        three: '有烟雾',
+        title: '序号',
+        dataIndex: '',
+        key: 'rowIndex',
+        width: 80,
+        align: 'center',
+        customRender: ({ index }) => {
+            return `${index + 1}`;
+        },
     },
     {
-        key: '44',
-        one: '电缆火灾最高温度',
-        two: '二级预警',
-        three: 'Rs>1.5Rp',
+        title: '预警等级',
+        dataIndex: 'yjdj',
+        align: 'center',
     },
     {
-        key: '45',
-        one: '电缆火灾最高温度',
-        two: '三级预警',
-        three: 'Rs>Rr>6Rp',
+        title: '煤自燃阶段',
+        dataIndex: 'zrjd',
+        align: 'center',
     },
     {
-        key: '46',
-        one: '电缆火灾最高温度',
-        two: '四级预警',
-        three: 'Rs>3.5Rp',
-    },
-
-])
-
-let columns = reactive([
-    {
-        title: '序号',
-        width: 60,
+        title: '指标',
         align: 'center',
-        customRender: ({ index }: { index: number }) =>{
-          if(index>=0 && index<=3){
-            return 1
-          }else if(index>=4 && index<=7){
-            return 2
-          }else if(index>=8 && index<=11){
-            return 3
-          }else if(index>=12 && index<=15){
-            return 4
-          }else if(index>=16 && index<=19){
-            return 5
-          }else if(index>=20 && index<=23){
-            return 6
-          }else if(index==24){
-            return 7
-          }else if(index==25){
-            return 8
-          }else if(index>=26 && index<=29){
-            return 9
-          }else if(index>=30 && index<=33){
-            return 10
-          }else if(index>=34 && index<=37){
-            return 11
-          }else if(index>=38 && index<=41){
-            return 12
-          }else if(index>=42 && index<=45){
-            return 13
-          }
-        },
-        customCell: (_, index) => {
-            if (index == 0) {
-                return { rowSpan: 4 };
-            } else if (index > 0 && index <= 3) {
-                return { rowSpan: 0 };
-            }
-            if (index == 4) {
-                return { rowSpan: 4 };
-            } else if (index > 4 && index <= 7) {
-                return { rowSpan: 0 };
-            }
-            if (index == 8) {
-                return { rowSpan: 4 };
-            } else if (index > 8 && index <= 11) {
-                return { rowSpan: 0 };
-            }
-            if (index == 12) {
-                return { rowSpan: 4 };
-            } else if (index > 12 && index <= 15) {
-                return { rowSpan: 0 };
-            }
-            if (index == 16) {
-                return { rowSpan: 4 };
-            } else if (index > 16 && index <= 19) {
-                return { rowSpan: 0 };
-            }
-            if (index == 20) {
-                return { rowSpan: 4 };
-            } else if (index > 20 && index <= 23) {
-                return { rowSpan: 0 };
-            }
-            if (index == 26) {
-                return { rowSpan: 4 };
-            } else if (index > 26 && index <= 29) {
-                return { rowSpan: 0 };
-            }
-            if (index == 30) {
-                return { rowSpan: 4 };
-            } else if (index > 30 && index <= 33) {
-                return { rowSpan: 0 };
-            }
-            if (index == 34) {
-                return { rowSpan: 4 };
-            } else if (index > 34 && index <= 37) {
-                return { rowSpan: 0 };
-            }
-            if (index == 38) {
-                return { rowSpan: 4 };
-            } else if (index > 38 && index <= 41) {
-                return { rowSpan: 0 };
-            }
-            if (index == 42) {
-                return { rowSpan: 4 };
-            } else if (index > 42 && index <= 45) {
-                return { rowSpan: 0 };
-            }
-        },
+        dataIndex: 'zb',
     },
     {
-        title: '指标',
-        dataIndex: 'one',
+        title: '条件',
         align: 'center',
-        customCell: (_, index) => {
-            if (index == 0) {
-                return { rowSpan: 4 };
-            } else if (index > 0 && index <= 3) {
-                return { rowSpan: 0 };
-            }
-            if (index == 4) {
-                return { rowSpan: 4 };
-            } else if (index > 4 && index <= 7) {
-                return { rowSpan: 0 };
-            }
-            if (index == 8) {
-                return { rowSpan: 4 };
-            } else if (index > 8 && index <= 11) {
-                return { rowSpan: 0 };
-            }
-            if (index == 12) {
-                return { rowSpan: 4 };
-            } else if (index > 12 && index <= 15) {
-                return { rowSpan: 0 };
-            }
-            if (index == 16) {
-                return { rowSpan: 4 };
-            } else if (index > 16 && index <= 19) {
-                return { rowSpan: 0 };
-            }
-            if (index == 20) {
-                return { rowSpan: 4 };
-            } else if (index > 20 && index <= 23) {
-                return { rowSpan: 0 };
-            }
-            if (index == 26) {
-                return { rowSpan: 4 };
-            } else if (index > 26 && index <= 29) {
-                return { rowSpan: 0 };
-            }
-            if (index == 30) {
-                return { rowSpan: 4 };
-            } else if (index > 30 && index <= 33) {
-                return { rowSpan: 0 };
-            }
-            if (index == 34) {
-                return { rowSpan: 4 };
-            } else if (index > 34 && index <= 37) {
-                return { rowSpan: 0 };
-            }
-            if (index == 38) {
-                return { rowSpan: 4 };
-            } else if (index > 38 && index <= 41) {
-                return { rowSpan: 0 };
-            }
-            if (index == 42) {
-                return { rowSpan: 4 };
-            } else if (index > 42 && index <= 45) {
-                return { rowSpan: 0 };
-            }
-        },
+        dataIndex: 'tj',
     },
     {
-        title: '预警级别',
-        dataIndex: 'two',
+        title: '温度',
         align: 'center',
+        dataIndex: 'wd',
     },
     {
-        title: '值',
+        title: '参考值',
         align: 'center',
-        dataIndex: 'three',
-
+        dataIndex: 'ckz',
     },
 ])
 
@@ -466,8 +84,23 @@ let columns = reactive([
 <style lang="less" scoped>
 .warnTargetFire {
     width: 100%;
-    height: 100%;
-    padding: 20px;
+    height: calc(100vh - 126px);
+    padding: 15px 0px;
     box-sizing: border-box;
+
+    .top-area {
+        height: 55%;
+        margin-bottom: 15px;
+        background: url('../../../../../assets/images/fire/bj1.png') no-repeat center;
+        background-size: 100% 100%;
+    }
+
+    .bot-area {
+        height: calc(45% - 10px);
+        background: url('../../../../../assets/images/fire/bj1.png') no-repeat center;
+        background-size: 100% 100%;
+
+    }
+
 }
 </style>

+ 172 - 66
src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -78,19 +78,19 @@
                     item.level != 0 && item.level != 101 && item.level != 102 && item.level != 103 && item.level != 104 && item.level != 201,
                 }">{{
                   item.level == 0
-                  ? '低风险'
-                  : item.level == 101
-                  ? '低风险'
-                  : item.level == 102
-                  ? '一般风险'
-                  : item.level == 103
-                  ? '较大风险'
-                  : item.level == 104
-                  ? '较大风险'
-                  : item.level == 201
-                  ? '报警'
-                  : '未连接'
-                  }}</div>
+                    ? '低风险'
+                    : item.level == 101
+                      ? '低风险'
+                      : item.level == 102
+                        ? '一般风险'
+                        : item.level == 103
+                          ? '较大风险'
+                          : item.level == 104
+                            ? '较大风险'
+                            : item.level == 201
+                              ? '报警'
+                              : '未连接'
+                }}</div>
               </div>
             </template>
           </div>
@@ -131,21 +131,21 @@
           <div class="text-box">
             <div class="text1">{{
               centerData.levels == 101
-              ? '低风险'
-              : centerData.levels == 102
-              ? '一般风险'
-              : centerData.levels == 103
-              ? '较大风险'
-              : centerData.levels == 104
-              ? '重大风险'
-              : centerData.levels == 201
-              ? '报警'
-              : // : centerData.levels == 0
-              // ? '正常'
-              // : centerData.levels == 10000
-              // ? '正常'
-              '低风险'
-              }}</div>
+                ? '低风险'
+                : centerData.levels == 102
+                  ? '一般风险'
+                  : centerData.levels == 103
+                    ? '较大风险'
+                    : centerData.levels == 104
+                      ? '重大风险'
+                      : centerData.levels == 201
+                        ? '报警'
+                        : // : centerData.levels == 0
+                        // ? '正常'
+                        // : centerData.levels == 10000
+                        // ? '正常'
+                        '低风险'
+            }}</div>
             <div class="text2">风险分析</div>
           </div>
           <div class="icon-animation"></div>
@@ -213,23 +213,61 @@
         <div class="container">
           <div class="item item1">
             <div class="icon"></div>
-            <div class="data-box" v-for="(item, index) in fireMonitor1" :key="index">
-              <div :class="{
-                value1: item.level == 0,
-                value2: item.level == 101,
-                value3: item.level == 102,
-                value4: item.level == 103,
-                value5: item.level == 104,
-                value6: item.level == 201,
-                value: item.level != 0 && item.level != 101 && item.level != 102 && item.level != 103 && item.level != 104 && item.level != 201,
-              }">{{ item.value ? item.value : '-' }}
+
+            <vue3-seamless-scroll hover-stop="true" :list="fireMonitor1" :hover="true" :step="0.2" :direction="'left'"
+              limitMoveNum="3" :copy-num="50" :single-line="true" class="seamless-warp1">
+              <div class="data-box" v-for="(item, index) in fireMonitor1" :key="index">
+                <div class="box-item">
+                  <div :class="{
+                    value1: item.value == '1',
+                    value2: item.value == '2',
+                    value3: item.value == '3',
+                    value4: item.value == '4',
+                    value5: item.value == '5',
+                    value6: item.value == '6',
+                  }">{{ item.value1 ? item.value1 : '--' }}</div>
+                  <div class="title">监测位置</div>
+                </div>
+
+                <div class="box-item">
+                  <div :class="{
+                    value1: item.value == '1',
+                    value2: item.value == '2',
+                    value3: item.value == '3',
+                    value4: item.value == '4',
+                    value5: item.value == '5',
+                    value6: item.value == '6',
+                  }">{{ item.value == '1' ? '正常' : item.value == '2' ? '低风险' : item.value == '3' ? '一般风险' : item.value
+                    ==
+                    '4' ?
+                    '较高风险' : item.value == '5' ? '高风险' : item.value == '6' ? '报警' : '--' }}
+                  </div>
+                  <div class="title">预警等级</div>
+                </div>
+                <div class="box-item">
+                  <div :class="{
+                    value1: item.value == '1',
+                    value2: item.value == '2',
+                    value3: item.value == '3',
+                    value4: item.value == '4',
+                    value5: item.value == '5',
+                    value6: item.value == '6',
+                  }">{{ item.value == '1' ? '氧化阶段' : item.value == '2' ? '自热阶段' : item.value == '3' ?
+                    '临界阶段'
+                    : item.value
+                      ==
+                      '4' ?
+                      '热解阶段' : item.value == '5' ? '裂变阶段' : item.value == '6' ? '燃烧阶段' : '--' }}
+                  </div>
+                  <div class="title">煤自燃阶段</div>
+                </div>
               </div>
-              <div class="title">{{ item.title }}</div>
-            </div>
+            </vue3-seamless-scroll>
+
           </div>
           <div class="item">
             <div class="icon"></div>
-            <div class="data-box" v-for="(item, index) in fireMonitor" :key="index">
+            <div class="data-box1" v-for="(item, index) in fireMonitor" :key="index">
               <!-- <div class="value1"> {{ !item.value ? '-' : item.value == '正常' ? '低风险' : item.value }} </div> -->
               <div class="value1"> {{ !item.value ? '低风险' : item.value == '正常' ? '低风险' : item.value }} </div>
               <div class="title">{{ item.title }}</div>
@@ -298,10 +336,11 @@ import { ref, onMounted, onUnmounted, reactive } from 'vue';
 import { useRouter } from 'vue-router';
 import customHeader from '/@/components/vent/customHeader.vue';
 import { getTotalList, sysTypeWarnList } from './alarm.api';
-import { iconsMonitor, chartsColumns, xAxisData, option, colors, fontColor, fireMonitor, fireMonitor1 } from './alarm.data';
+import { iconsMonitor, chartsColumns, xAxisData, option, colors, fontColor, fireMonitor, } from './alarm.data';
 import ventBox1 from '/@/components/vent/ventBox1.vue';
 import BarSingle from '../../../../components/chart/BarSingle.vue';
 import { rainBg } from '/@/utils/ui.js';
+import { Vue3SeamlessScroll } from 'vue3-seamless-scroll'
 
 let router = useRouter();
 
@@ -340,6 +379,8 @@ let gasData = {
   sums1: 0,
 };
 
+let fireMonitor1 = reactive<any[]>([])
+
 //跳转详情
 function showModal(data) {
   switch (data) {
@@ -381,6 +422,7 @@ function getMonitor(flag = false) {
 async function getList() {
   const res = await getTotalList({});
   console.log(res, '预警数据--------------');
+  fireMonitor1.length = 0
   let data = [];
   windData.levels = res.info.sysInfo.ventS.levels;
   windData.levels['blue'] = warnNumMap.get('vent');
@@ -430,29 +472,15 @@ async function getList() {
       ? res.info.sysInfo.fireS.summaryInfo.external.coval.value
       : '';
 
-  // fireMonitor[0].level = res.info.sysInfo.fireS.summaryInfo.external.temperature ? res.info.sysInfo.fireS.summaryInfo.external.temperature.maxlevel : '';
-  // fireMonitor[1].value = res.info.sysInfo.fireS.summaryInfo.external.coval ? res.info.sysInfo.fireS.summaryInfo.external.coval.value : '';
-  // fireMonitor[1].level = res.info.sysInfo.fireS.summaryInfo.external.coval ? res.info.sysInfo.fireS.summaryInfo.external.coval.maxlevel : '';
-  // fireMonitor[2].value = res.info.sysInfo.fireS.summaryInfo.external.chval ? res.info.sysInfo.fireS.summaryInfo.external.chval.value : '';
-  // fireMonitor[2].level = res.info.sysInfo.fireS.summaryInfo.external.chval ? res.info.sysInfo.fireS.summaryInfo.external.chval.maxlevel : '';
-  // fireMonitor[3].value = res.info.sysInfo.fireS.summaryInfo.external.ch2val ? res.info.sysInfo.fireS.summaryInfo.external.ch2val.value : '';
-  // fireMonitor[3].level = res.info.sysInfo.fireS.summaryInfo.external.ch2val ? res.info.sysInfo.fireS.summaryInfo.external.ch2val.maxlevel : '';
-  // fireMonitor[4].value = res.info.sysInfo.fireS.summaryInfo.external.co2val ? res.info.sysInfo.fireS.summaryInfo.external.co2val.value : '';
-  // fireMonitor[4].level = res.info.sysInfo.fireS.summaryInfo.external.co2val ? res.info.sysInfo.fireS.summaryInfo.external.co2val.maxlevel : '';
-  // fireMonitor[5].value = res.info.sysInfo.fireS.summaryInfo.external.o2val ? res.info.sysInfo.fireS.summaryInfo.external.o2val.value : '';
-  // fireMonitor[5].level = res.info.sysInfo.fireS.summaryInfo.external.o2val ? res.info.sysInfo.fireS.summaryInfo.external.o2val.maxlevel : '';
-
-  fireMonitor1[0].value = res.info.sysInfo.fireS.summaryInfo.internal.coval ? res.info.sysInfo.fireS.summaryInfo.internal.coval.value : '';
-  // fireMonitor1[0].value = res.info.sysInfo.fireS.summaryInfo.internal.coval ? '50.0' : '';
-  fireMonitor1[0].level = res.info.sysInfo.fireS.summaryInfo.internal.coval ? res.info.sysInfo.fireS.summaryInfo.internal.coval.maxlevel : '';
-  fireMonitor1[1].value = res.info.sysInfo.fireS.summaryInfo.internal.chval ? res.info.sysInfo.fireS.summaryInfo.internal.chval.value : '';
-  fireMonitor1[1].level = res.info.sysInfo.fireS.summaryInfo.internal.chval ? res.info.sysInfo.fireS.summaryInfo.internal.chval.maxlevel : '';
-  fireMonitor1[2].value = res.info.sysInfo.fireS.summaryInfo.internal.ch2val ? res.info.sysInfo.fireS.summaryInfo.internal.ch2val.value : '';
-  fireMonitor1[2].level = res.info.sysInfo.fireS.summaryInfo.internal.ch2val ? res.info.sysInfo.fireS.summaryInfo.internal.ch2val.maxlevel : '';
-  fireMonitor1[3].value = res.info.sysInfo.fireS.summaryInfo.internal.co2val ? res.info.sysInfo.fireS.summaryInfo.internal.co2val.value : '';
-  fireMonitor1[3].level = res.info.sysInfo.fireS.summaryInfo.internal.co2val ? res.info.sysInfo.fireS.summaryInfo.internal.co2val.maxlevel : '';
-  fireMonitor1[4].value = res.info.sysInfo.fireS.summaryInfo.internal.o2val ? res.info.sysInfo.fireS.summaryInfo.internal.o2val.value : '';
-  fireMonitor1[4].level = res.info.sysInfo.fireS.summaryInfo.internal.o2val ? res.info.sysInfo.fireS.summaryInfo.internal.o2val.maxlevel : '';
+
+  if (res.bundletubeInfo.msgTxt[0].datalist.length != 0) {
+    res.bundletubeInfo.msgTxt[0].datalist.forEach((el, ind) => {
+      fireMonitor1.push({
+        value: el.readData.internalFireWarnLevel,
+        value1: el.strinstallpos,
+      })
+    })
+  }
   gasMonitor.length = 0;
   gasData.sums = 0;
   gasData.sums1 = 0;
@@ -830,7 +858,7 @@ onUnmounted(() => {
             }
           }
 
-          .data-box {
+          .data-box1 {
             display: flex;
             flex-direction: column;
             // margin: 0 10px;
@@ -890,6 +918,84 @@ onUnmounted(() => {
               font-size: 13px;
             }
           }
+
+          .seamless-warp1 {
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+
+            .data-box {
+              display: flex;
+              width: 360px;
+              justify-content: center;
+              align-items: center;
+
+              .box-item {
+                width: 110px;
+                height: 100%;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+
+                .value {
+                  font-size: 16px;
+                  font-family: 'douyuFont';
+                  color: #2bdcff;
+                  margin-bottom: 5px;
+                }
+
+                .value1 {
+                  font-size: 16px;
+                  font-family: 'douyuFont';
+                  margin-bottom: 5px;
+                  color: rgb(145, 230, 9);
+                }
+
+                .value2 {
+                  font-size: 16px;
+                  font-family: 'douyuFont';
+                  margin-bottom: 5px;
+                  color: rgb(0, 242, 255);
+                }
+
+                .value3 {
+                  font-size: 16px;
+                  font-family: 'douyuFont';
+                  margin-bottom: 5px;
+                  color: #ffff35;
+                }
+
+                .value4 {
+                  font-size: 16px;
+                  font-family: 'douyuFont';
+                  margin-bottom: 5px;
+                  color: #ffbe69;
+                }
+
+                .value5 {
+                  font-size: 16px;
+                  font-family: 'douyuFont';
+                  margin-bottom: 5px;
+                  color: #ff6f00;
+                }
+
+                .value6 {
+                  font-size: 16px;
+                  font-family: 'douyuFont';
+                  margin-bottom: 5px;
+                  color: #ff0000;
+                }
+
+                .title {
+                  font-size: 13px;
+                }
+              }
+
+
+            }
+          }
+
+
         }
 
         .item1 {

+ 60 - 6
src/views/vent/monitorManager/alarmMonitor/warn/fireWarn.vue

@@ -1,6 +1,6 @@
 <template>
     <customHeader :options="options" @change="getSelectRow" :optionValue="optionValue"> 火灾监测预警 </customHeader>
-    <div class="fireWarn">
+    <div :class="isZb ? 'fireWarn1' : 'fireWarn'">
         <a-button preIcon="ant-design:rollback-outlined" type="text" size="small"
             style="position: absolute;left:15px;top:15px;color: #fff;" @click="getBack">返回</a-button>
         <div class="alarm-menu">
@@ -40,6 +40,7 @@ let currentLoad = ref('')
 let activeIndex = ref(0);
 //当前激活菜单的索引
 let activeIndex1 = ref(0);
+let isZb = ref(false)
 let menuList = reactive<any[]>([]); //左侧菜单列表
 let menuList1 = reactive({
     external: [],
@@ -51,7 +52,7 @@ let listData = reactive({
     bundletube: [],
     fiber: [],
     fire: [],
-    co:[],
+    co: [],
     smoke: [],
     spray: [],
     temperature: [],
@@ -106,7 +107,7 @@ function getSysWarnList(id, type) {
         listData.bundletube = res.bundletube;
         listData.fiber = res.fiber;
         listData.fire = res.fire;
-        listData.co=res.co;
+        listData.co = res.co;
         listData.smoke = res.smoke;
         listData.spray = res.spray;
         listData.temperature = res.temperature;
@@ -122,6 +123,7 @@ function btnClick(ind) {
         case 0:
             activeIndex1.value = 0;
             menuList.length = 0;
+            isZb.value = false
             currentLoad.value = '';
             menuList1.internal.forEach((el) => {
                 menuList.push({
@@ -138,6 +140,7 @@ function btnClick(ind) {
             break;
         case 1:
             activeIndex1.value = 0;
+            isZb.value = false
             menuList.length = 0;
             currentLoad.value = '';
             if (menuList1.external.length != 0) {
@@ -162,6 +165,7 @@ function btnClick(ind) {
             break;
         case 2:
             activeIndex1.value = 0;
+            isZb.value = true
             menuList.length = 0;
             currentLoad.value = 'warnTargetFire';
             break;
@@ -182,9 +186,9 @@ function loadZj() {
         currentLoad.value = 'fireWork';
     } else if (!activeIndex.value && listData.bundletube.length != 0) {
         currentLoad.value = 'closeWall';
-    } else if (activeIndex.value && activeIndex.value!=2) {
+    } else if (activeIndex.value && activeIndex.value != 2) {
         currentLoad.value = 'mainWell';
-    }else if(activeIndex.value==2){
+    } else if (activeIndex.value == 2) {
         currentLoad.value = 'warnTargetFire';
     } else {
         currentLoad.value = '';
@@ -196,7 +200,7 @@ function getClearList() {
     listData.bundletube.length = 0;
     listData.fiber.length = 0;
     listData.fire.length = 0;
-    listData.co.length=0;
+    listData.co.length = 0;
     listData.smoke.length = 0;
     listData.spray.length = 0;
     listData.temperature.length = 0;
@@ -340,4 +344,54 @@ onUnmounted(() => {
     }
 
 }
+
+.fireWarn1 {
+    width: 100%;
+    height: 100%;
+    padding: 80px 10px 15px 10px;
+    box-sizing: border-box;
+
+    .alarm-menu {
+        width: 100%;
+        
+        .type-btn {
+            width: 100%;
+            height: 30px;
+            line-height: 30px;
+            border: 1px solid #0058ee;
+            border-radius: 5px;
+            box-sizing: border-box;
+            display: flex;
+            justify-content: space-between;
+
+            .btn {
+                width: 33%;
+                height: 100%;
+                font-size: 14px;
+                text-align: center;
+                color: #fff;
+                cursor: pointer;
+            }
+
+            .btn1 {
+                width: 33%;
+                height: 100%;
+                font-size: 14px;
+                color: #fff;
+                text-align: center;
+                border-radius: 2px;
+                background: #0058ee;
+                cursor: pointer;
+            }
+        }
+
+        .card-btn {
+            width: 100%;
+            height: calc(100% - 30px);
+            overflow-y: auto;
+            display: none;
+         
+        }
+    }
+}
 </style>

+ 6 - 0
src/views/vent/monitorManager/camera/index.vue

@@ -157,6 +157,12 @@ function onDetail(node) {
     case 'pump_under':
       router.push('/monitorChannel/gasPump-home?id=' + node.deviceID)
       break;
+      // case 'window_normal'://自动风窗
+      // router.push('/monitorChannel/gasPump-home?id=' + node.deviceID)
+      // break;
+      // case 'gate_xinjianfuxiejin'://自动风门
+      // router.push('/monitorChannel/gasPump-home?id=' + node.deviceID)
+      // break;
   }
 }
 

+ 388 - 360
src/views/vent/monitorManager/deviceMonitor/components/device/modal/bundle.modal.vue

@@ -1,21 +1,10 @@
 <template>
-  <BasicModal
-    v-bind="$attrs"
-    @register="register"
-    :title="`束管监测详情 ${currentTime}`"
-    width="1200px"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    wrapClassName="bundle-modal"
-  >
+  <BasicModal v-bind="$attrs" @register="register" :title="`束管监测详情 ${currentTime}`" width="1200px" @ok="handleOk"
+    @cancel="handleCancel" wrapClassName="bundle-modal">
     <div class="fiber-modal">
       <div class="modal-left">
-        <div
-          v-for="device in deviceList"
-          class="link-item"
-          :class="{ 'active-device-title': device.deviceID === activeDeviceID }"
-          :key="device.deviceID"
-        >
+        <div v-for="device in deviceList" class="link-item"
+          :class="{ 'active-device-title': device.deviceID === activeDeviceID }" :key="device.deviceID">
           <span class="" @click="selectDevice(device.deviceID)">{{ device.strinstallpos }}</span>
         </div>
       </div>
@@ -28,7 +17,8 @@
             </div>
             <div class="item-container">
               <div class="title">一氧化碳</div>
-              <div class="value">{{ posMonitor.coval !== undefined && posMonitor.coval !== null ? posMonitor.coval : '-' }} <span>ppm</span> </div>
+              <div class="value">{{ posMonitor.coval !== undefined && posMonitor.coval !== null ? posMonitor.coval : '-'
+                }} <span>ppm</span> </div>
             </div>
           </div>
           <div class="top-item">
@@ -37,7 +27,8 @@
             </div>
             <div class="item-container">
               <div class="title">二氧化碳</div>
-              <div class="value">{{ posMonitor.co2val !== undefined && posMonitor.co2val !== null ? posMonitor.co2val : '-' }} <span>%</span></div>
+              <div class="value">{{ posMonitor.co2val !== undefined && posMonitor.co2val !== null ? posMonitor.co2val :
+                '-' }} <span>%</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -46,7 +37,8 @@
             </div>
             <div class="item-container">
               <div class="title">甲烷</div>
-              <div class="value">{{ posMonitor.gasval !== undefined && posMonitor.gasval !== null ? posMonitor.gasval : '-' }} <span>%</span></div>
+              <div class="value">{{ posMonitor.gasval !== undefined && posMonitor.gasval !== null ? posMonitor.gasval :
+                '-' }} <span>%</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -55,7 +47,8 @@
             </div>
             <div class="item-container">
               <div class="title">乙烯</div>
-              <div class="value">{{ posMonitor.ch2val !== undefined && posMonitor.ch2val !== null ? posMonitor.ch2val : '-' }} <span>ppm</span></div>
+              <div class="value">{{ posMonitor.ch2val !== undefined && posMonitor.ch2val !== null ? posMonitor.ch2val :
+                '-' }} <span>ppm</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -64,7 +57,8 @@
             </div>
             <div class="item-container">
               <div class="title">乙炔</div>
-              <div class="value">{{ posMonitor.chval !== undefined && posMonitor.chval !== null ? posMonitor.chval : '-' }} <span>ppm</span></div>
+              <div class="value">{{ posMonitor.chval !== undefined && posMonitor.chval !== null ? posMonitor.chval : '-'
+                }} <span>ppm</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -73,7 +67,8 @@
             </div>
             <div class="item-container">
               <div class="title">氧气</div>
-              <div class="value">{{ posMonitor.o2val !== undefined && posMonitor.o2val !== null ? posMonitor.o2val : '-' }} <span>%</span></div>
+              <div class="value">{{ posMonitor.o2val !== undefined && posMonitor.o2val !== null ? posMonitor.o2val : '-'
+                }} <span>%</span></div>
             </div>
           </div>
           <div class="top-item warning-box">
@@ -82,7 +77,20 @@
             </div>
             <div class="item-container">
               <div class="title">风险等级</div>
-              <div class="warning-value">{{ posMonitor['warnLevel_str'] ? posMonitor['warnLevel_str'] : '-' }}</div>
+              <div :class="{
+                value1: posMonitor['internalFireWarnLevel'] == '1',
+                value2: posMonitor['internalFireWarnLevel'] == '2',
+                value3: posMonitor['internalFireWarnLevel'] == '3',
+                value4: posMonitor['internalFireWarnLevel'] == '4',
+                value5: posMonitor['internalFireWarnLevel'] == '5',
+                value6: posMonitor['internalFireWarnLevel'] == '6',
+              }">{{ posMonitor['internalFireWarnLevel'] == '1' ? '正常' : posMonitor['internalFireWarnLevel'] == '2' ?
+                '低风险' :
+                posMonitor['internalFireWarnLevel'] == '3' ? '一般风险' : posMonitor['internalFireWarnLevel'] == '4' ?
+                  '较高风险' :
+                  posMonitor['internalFireWarnLevel'] == '5' ? '高风险' : posMonitor['internalFireWarnLevel'] == '6' ? '报警' :
+                    '-'
+                }}</div>
             </div>
           </div>
           <div class="top-item warning-box">
@@ -96,20 +104,11 @@
           </div>
         </div>
         <div class="right-bottom">
-          <span class="base-title"
-            >设备监测曲线&nbsp; <span style="color: red">{{ posMonitor['netStatus'] != 1 ? '(设备未连接)' : '' }}</span></span
-          >
+          <span class="base-title">设备监测曲线&nbsp; <span style="color: red">{{ posMonitor['netStatus'] != 1 ? '(设备未连接)' :
+            '' }}</span></span>
           <div class="echarts-box">
-            <BarAndLine
-              class="echarts-line"
-              :xAxisPropType="xAxisPropType"
-              :dataSource="historyList"
-              height="100%"
-              width="65%"
-              :chartsColumns="chartsColumns"
-              :option="echatsOption"
-              chartsType="listMonitor"
-            />
+            <BarAndLine class="echarts-line" :xAxisPropType="xAxisPropType" :dataSource="historyList" height="100%"
+              width="65%" :chartsColumns="chartsColumns" :option="echatsOption" chartsType="listMonitor" />
 
             <!-- 爆炸三角形 -->
             <div style="width: 35%; height: 100%; margin: 0px auto">
@@ -122,397 +121,426 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, watch, shallowRef, onMounted } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import BarAndLine from '/@/components/chart/BarAndLine.vue';
-  import blastDelta from './blastDelta.vue';
-  import { SvgIcon } from '/@/components/Icon';
-  import dayjs from 'dayjs';
-  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
-  import { chartsColumnList } from '../device.data';
-  import { listdays, getHistoryData } from '../device.api';
-
-  export default defineComponent({
-    components: { BasicModal, BarAndLine, SvgIcon, blastDelta },
-    props: {
-      dataSource: { type: Array },
-      activeID: { type: String },
-    },
-    setup(props) {
-      const currentTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
-      const modelRef = ref({});
-      const loading = ref(true);
-      const activeDeviceID = ref('');
-      const deviceList = ref<any[]>([]);
-      const historyList = ref<any[]>([]);
-      const posList = ref<any[]>([]);
-      const posMonitor = shallowRef({});
-
-      const echatsOption = {
-        grid: {
-          top: '29%',
-          left: '3',
-          right: '45',
-          bottom: '3%',
-          containLabel: true,
-        },
-        toolbox: {
-          feature: {},
-        },
-      };
-
-      const chartsColumnArr = getTableHeaderColumns('bundletube_chart');
-      const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
-      const xAxisPropType = ref('ttime');
-      const [register, { setModalProps, closeModal }] = useModalInner();
-
-      function handleVisibleChange(visible) {
-        if (visible) {
-          loading.value = true;
-          setModalProps({ loading: true, confirmLoading: true });
-
-          setTimeout(() => {
-            loading.value = false;
-            setModalProps({ loading: false, confirmLoading: false });
-          }, 1000);
-        }
-      }
-
-      // 选择监测
-      function selectDevice(id) {
+import { defineComponent, ref, watch, shallowRef, onMounted } from 'vue';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import BarAndLine from '/@/components/chart/BarAndLine.vue';
+import blastDelta from './blastDelta.vue';
+import { SvgIcon } from '/@/components/Icon';
+import dayjs from 'dayjs';
+import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+import { chartsColumnList } from '../device.data';
+import { listdays, getHistoryData } from '../device.api';
+
+export default defineComponent({
+  components: { BasicModal, BarAndLine, SvgIcon, blastDelta },
+  props: {
+    dataSource: { type: Array },
+    activeID: { type: String },
+  },
+  setup(props) {
+    const currentTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
+    const modelRef = ref({});
+    const loading = ref(true);
+    const activeDeviceID = ref('');
+    const deviceList = ref<any[]>([]);
+    const historyList = ref<any[]>([]);
+    const posList = ref<any[]>([]);
+    const posMonitor = shallowRef({});
+
+    const echatsOption = {
+      grid: {
+        top: '29%',
+        left: '3',
+        right: '45',
+        bottom: '3%',
+        containLabel: true,
+      },
+      toolbox: {
+        feature: {},
+      },
+    };
+
+    const chartsColumnArr = getTableHeaderColumns('bundletube_chart');
+    const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
+    const xAxisPropType = ref('ttime');
+    const [register, { setModalProps, closeModal }] = useModalInner();
+
+    function handleVisibleChange(visible) {
+      if (visible) {
         loading.value = true;
         setModalProps({ loading: true, confirmLoading: true });
+
         setTimeout(() => {
           loading.value = false;
-          activeDeviceID.value = id;
           setModalProps({ loading: false, confirmLoading: false });
-        }, 300);
-        getListdays();
+        }, 1000);
       }
+    }
 
-      function handleOk(e) {
-        e.preventDefault();
-        closeModal();
-      }
+    // 选择监测
+    function selectDevice(id) {
+      loading.value = true;
+      setModalProps({ loading: true, confirmLoading: true });
+      setTimeout(() => {
+        loading.value = false;
+        activeDeviceID.value = id;
+        setModalProps({ loading: false, confirmLoading: false });
+      }, 300);
+      getListdays();
+    }
 
-      function handleCancel(e) {
-        e.preventDefault();
-        closeModal();
-      }
+    function handleOk(e) {
+      e.preventDefault();
+      closeModal();
+    }
+
+    function handleCancel(e) {
+      e.preventDefault();
+      closeModal();
+    }
 
-      //获取历史数据
-      async function getListdays() {
-        if (posMonitor.value.stationtype && posMonitor.value.stationtype != 'redis') {
-          xAxisPropType.value = 'ttime';
-          const ttime_begin = dayjs().startOf('date').format('YYYY-MM-DD HH:mm:ss');
-          const ttime_end = dayjs().format('YYYY-MM-DD HH:mm:ss');
-          const pageNo = 1;
-          const pageSize = 100;
-          const skip = 8;
-          const strtype = posMonitor.value.deviceType;
-          let res = await listdays({
-            ttime_begin,
-            ttime_end,
-            pageNo,
-            pageSize,
-            skip,
-            strtype,
-            column: 'createTime',
-            gdeviceid: activeDeviceID.value,
+    //获取历史数据
+    async function getListdays() {
+      if (posMonitor.value.stationtype && posMonitor.value.stationtype != 'redis') {
+        xAxisPropType.value = 'ttime';
+        const ttime_begin = dayjs().startOf('date').format('YYYY-MM-DD HH:mm:ss');
+        const ttime_end = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        const pageNo = 1;
+        const pageSize = 100;
+        const skip = 8;
+        const strtype = posMonitor.value.deviceType;
+        let res = await listdays({
+          ttime_begin,
+          ttime_end,
+          pageNo,
+          pageSize,
+          skip,
+          strtype,
+          column: 'createTime',
+          gdeviceid: activeDeviceID.value,
+        });
+        console.log(res, '束管历史数据');
+        let data = res.datalist.records;
+        if (data.length != 0) {
+          data.forEach((el) => {
+            Object.assign(el, el.readData);
+          });
+        }
+        historyList.value = data;
+      } else {
+        const params = {
+          pageNum: 1,
+          pageSize: 100,
+          startTime: dayjs(new Date().getTime() - 3 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss'),
+          endTime: dayjs(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss'),
+          deviceId: activeDeviceID.value,
+          interval: '1h',
+          isEmployee: true,
+        };
+        xAxisPropType.value = 'time';
+        const result = await getHistoryData({ ...params });
+        if (result['records'].length != 0) {
+          result['records'].forEach((el) => {
+            el.ch2val = el.C2H4;
+            el.chval = el.C2H2;
+            el.co2val = el.CO2;
+            el.coval = el.CO;
+            el.gasval = el.CH4;
+            el.o2val = el.O2;
           });
-          console.log(res, '束管历史数据');
-          let data = res.datalist.records;
-          if (data.length != 0) {
-            data.forEach((el) => {
-              Object.assign(el, el.readData);
-            });
-          }
-          historyList.value = data;
-        } else {
-          const params = {
-            pageNum: 1,
-            pageSize: 100,
-            startTime: dayjs(new Date().getTime() - 3 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss'),
-            endTime: dayjs(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss'),
-            deviceId: activeDeviceID.value,
-            interval: '1h',
-            isEmployee: true,
-          };
-          xAxisPropType.value = 'time';
-          const result = await getHistoryData({ ...params });
-          if (result['records'].length != 0) {
-            result['records'].forEach((el) => {
-              el.ch2val = el.C2H4;
-              el.chval = el.C2H2;
-              el.co2val = el.CO2;
-              el.coval = el.CO;
-              el.gasval = el.CH4;
-              el.o2val = el.O2;
-            });
-          }
-          historyList.value = result['records'];
         }
+        historyList.value = result['records'];
       }
+    }
 
-      watch(
-        [() => props.dataSource, () => props.activeID],
-        ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
-          // if (newActiveID != oldActiveID) {
-          //   activeDeviceID.value = newActiveID as string;
-          // }
-          activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
-          deviceList.value = newDataSource?.filter((item: any, index) => {
-            if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-              // activeDeviceID.value = item.deviceID;
-              posMonitor.value = Object.assign(item, item.readData);
-            }
-            item.readTime = item.readTime?.substring(11);
-            return item;
-          });
-          debugger;
-        },
-        { immediate: true }
-      );
-      onMounted(() => {
-        getListdays();
-      });
-      return {
-        register,
-        model: modelRef,
-        currentTime,
-        handleVisibleChange,
-        selectDevice,
-        handleOk,
-        handleCancel,
-        deviceList,
-        historyList,
-        activeDeviceID,
-        posMonitor,
-        echatsOption,
-        posList,
-        chartsColumns,
-        xAxisPropType,
-      };
-    },
-  });
+    watch(
+      [() => props.dataSource, () => props.activeID],
+      ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
+        // if (newActiveID != oldActiveID) {
+        //   activeDeviceID.value = newActiveID as string;
+        // }
+        activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
+        deviceList.value = newDataSource?.filter((item: any, index) => {
+          if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
+            // activeDeviceID.value = item.deviceID;
+            posMonitor.value = Object.assign(item, item.readData);
+          }
+          item.readTime = item.readTime?.substring(11);
+          return item;
+        });
+      },
+      { immediate: true }
+    );
+    onMounted(() => {
+      getListdays();
+    });
+    return {
+      register,
+      model: modelRef,
+      currentTime,
+      handleVisibleChange,
+      selectDevice,
+      handleOk,
+      handleCancel,
+      deviceList,
+      historyList,
+      activeDeviceID,
+      posMonitor,
+      echatsOption,
+      posList,
+      chartsColumns,
+      xAxisPropType,
+    };
+  },
+});
 </script>
 <style lang="less">
-  .bundle-modal {
-    .zxm-modal {
-      top: 30px !important;
-    }
+.bundle-modal {
+  .zxm-modal {
+    top: 30px !important;
   }
+}
 </style>
 
 <style lang="less" scoped>
-  .fiber-modal {
-    width: 100%;
-    height: 650px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-
-    .modal-left {
-      width: 200px;
-      height: 100%;
-      overflow-y: auto;
-      background: #ffffff11;
-      padding: 5px;
-      border-radius: 5px;
-
-      .active-device-title {
-        color: aqua;
-      }
+.fiber-modal {
+  width: 100%;
+  height: 650px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+
+  .modal-left {
+    width: 200px;
+    height: 100%;
+    overflow-y: auto;
+    background: #ffffff11;
+    padding: 5px;
+    border-radius: 5px;
+
+    .active-device-title {
+      color: aqua;
+    }
 
-      .link-item {
-        position: relative;
-        cursor: pointer;
-        line-height: 30px;
-        padding-left: 30px;
+    .link-item {
+      position: relative;
+      cursor: pointer;
+      line-height: 30px;
+      padding-left: 30px;
 
-        span:hover {
-          color: #89ffff;
-        }
+      span:hover {
+        color: #89ffff;
+      }
 
-        &::after {
-          content: '';
-          position: absolute;
-          display: block;
-          width: 8px;
-          height: 8px;
-          top: 12px;
-          left: 10px;
-          transform: rotateZ(45deg) skew(10deg, 10deg);
-          background: #45d3fd;
-        }
+      &::after {
+        content: '';
+        position: absolute;
+        display: block;
+        width: 8px;
+        height: 8px;
+        top: 12px;
+        left: 10px;
+        transform: rotateZ(45deg) skew(10deg, 10deg);
+        background: #45d3fd;
       }
     }
+  }
 
-    .modal-right {
-      width: calc(100% - 220px);
-      overflow-y: auto;
-
-      .base-title {
-        line-height: 32px;
-        position: relative;
-        padding-left: 20px;
-
-        &::after {
-          content: '';
-          position: absolute;
-          display: block;
-          width: 4px;
-          height: 12px;
-          top: 4px;
-          left: 10px;
-          background: #45d3fd;
-          border-radius: 4px;
-        }
+  .modal-right {
+    width: calc(100% - 220px);
+    overflow-y: auto;
+
+    .base-title {
+      line-height: 32px;
+      position: relative;
+      padding-left: 20px;
+
+      &::after {
+        content: '';
+        position: absolute;
+        display: block;
+        width: 4px;
+        height: 12px;
+        top: 4px;
+        left: 10px;
+        background: #45d3fd;
+        border-radius: 4px;
       }
+    }
+
+    .right-top {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      flex-wrap: wrap;
+      margin-bottom: 10px;
 
-      .right-top {
+      .top-item {
+        width: 220px;
+        height: 100px;
         display: flex;
         flex-direction: row;
-        justify-content: space-between;
-        flex-wrap: wrap;
-        margin-bottom: 10px;
+        justify-content: center;
+        border: 1px solid rgba(25, 237, 255, 0.4);
+        box-shadow: inset 0 0 10px rgba(0, 197, 255, 0.6);
+        background: rgba(0, 0, 0, 0.06666666666666667);
+        padding-top: 20px;
+        margin: 10px 0;
+
+        .icon {
+          margin-right: 10px;
+          margin-top: 5px;
+          color: #fdb146;
+        }
 
-        .top-item {
-          width: 220px;
-          height: 100px;
+        .item-container {
+          width: 110px;
           display: flex;
-          flex-direction: row;
+          flex-direction: column;
           justify-content: center;
-          border: 1px solid rgba(25, 237, 255, 0.4);
-          box-shadow: inset 0 0 10px rgba(0, 197, 255, 0.6);
-          background: rgba(0, 0, 0, 0.06666666666666667);
-          padding-top: 20px;
-          margin: 10px 0;
-
-          .icon {
-            margin-right: 10px;
-            margin-top: 5px;
-            color: #fdb146;
-          }
 
-          .item-container {
-            width: 110px;
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
+          div {
+            text-align: center;
+          }
 
-            div {
-              text-align: center;
-            }
+          .title {
+            font-size: 18px;
+          }
 
-            .title {
+          .value {
+            text-shadow: 0 0 25px #00fbfe;
+            background: linear-gradient(0deg, #45d3fd, #45d3fd, #61ddb1, #61ddb1);
+            font-style: normal;
+            background-size: cover;
+            font-family: electronicFont;
+            font-size: 30px;
+            -webkit-background-clip: text;
+            background-clip: text;
+            -webkit-text-fill-color: transparent;
+            position: relative;
+            top: -8px;
+
+            span {
+              font-family: Arial, Helvetica, sans-serif;
               font-size: 18px;
-            }
-
-            .value {
-              text-shadow: 0 0 25px #00fbfe;
-              background: linear-gradient(0deg, #45d3fd, #45d3fd, #61ddb1, #61ddb1);
-              font-style: normal;
-              background-size: cover;
-              font-family: electronicFont;
-              font-size: 30px;
-              -webkit-background-clip: text;
-              background-clip: text;
-              -webkit-text-fill-color: transparent;
-              position: relative;
-              top: -8px;
-
-              span {
-                font-family: Arial, Helvetica, sans-serif;
-                font-size: 18px;
-                color: aliceblue;
-              }
+              color: aliceblue;
             }
           }
         }
+      }
 
-        .warning-box {
-          padding-top: 0px;
+      .warning-box {
+        padding-top: 0px;
 
-          .icon {
-            margin-top: 20px;
+        .icon {
+          margin-top: 20px;
 
-            :deep(.icon-style) {
-              width: auto;
-              color: #fdb146;
-            }
+          :deep(.icon-style) {
+            width: auto;
+            color: #fdb146;
           }
+        }
 
-          .warning-value {
-            font-size: 18px;
-            color: #61ddb1;
-          }
+        .warning-value {
+          font-size: 18px;
+          color: #61ddb1;
         }
-      }
 
-      .right-center {
-        margin-top: 20px;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
+        .value1 {
+          font-size: 18px;
+          color: rgb(145, 230, 9) !important;
+        }
 
-        .table-box {
-          position: relative;
-          width: 500px;
-          height: 250px;
+        .value2 {
+          font-size: 18px;
+          color: rgb(0, 242, 255) !important;
         }
 
-        .warning-box {
-          width: calc(100% - 520px);
+        .value3 {
+          font-size: 18px;
+          color: #ffff35 !important;
+        }
 
-          .warning-container {
-            width: 100%;
-            height: convert;
-            background: #009acd00;
+        .value4 {
+          font-size: 18px;
+          color: #ffbe69 !important;
+        }
 
-            :deep(.dv-scroll-board) {
-              .row-item {
-                height: 40px !important;
-                line-height: 40px !important;
-              }
+        .value5 {
+          font-size: 18px;
+          color: #ff6f00 !important;
+        }
 
-              .header-item {
-                border-top: 1px solid #91e9fe !important;
-                border-bottom: 1px solid #91e9fe !important;
-              }
-            }
-          }
+        .value6 {
+          font-size: 18px;
+          color: #ff0000 !important;
         }
       }
+    }
+
+    .right-center {
+      margin-top: 20px;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+
+      .table-box {
+        position: relative;
+        width: 500px;
+        height: 250px;
+      }
 
-      .right-bottom {
-        margin-top: 20px;
+      .warning-box {
+        width: calc(100% - 520px);
 
-        .echarts-box {
+        .warning-container {
           width: 100%;
-          height: 320px;
-          position: relative;
-          display: flex;
-          justify-content: space-between;
+          height: convert;
+          background: #009acd00;
 
-          .echarts-line {
-            width: calc(100% + 80px);
-            position: absolute;
+          :deep(.dv-scroll-board) {
+            .row-item {
+              height: 40px !important;
+              line-height: 40px !important;
+            }
+
+            .header-item {
+              border-top: 1px solid #91e9fe !important;
+              border-bottom: 1px solid #91e9fe !important;
+            }
           }
         }
       }
     }
-  }
 
-  :deep(.zxm-table-body) {
-    border: 1px solid rgba(57, 232, 255, 0.2) !important;
+    .right-bottom {
+      margin-top: 20px;
+
+      .echarts-box {
+        width: 100%;
+        height: 320px;
+        position: relative;
+        display: flex;
+        justify-content: space-between;
 
-    .zxm-table-tbody > tr > td {
-      border: none !important;
+        .echarts-line {
+          width: calc(100% + 80px);
+          position: absolute;
+        }
+      }
     }
   }
+}
 
-  :deep(.zxm-table-cell) {
-    border-right: none !important;
+:deep(.zxm-table-body) {
+  border: 1px solid rgba(57, 232, 255, 0.2) !important;
+
+  .zxm-table-tbody>tr>td {
+    border: none !important;
   }
+}
+
+:deep(.zxm-table-cell) {
+  border-right: none !important;
+}
 </style>