[Mod 0000] 修改压风管控系统单位；崖坪视频播放添加rtsp类型

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

@@ -2,28 +2,26 @@ import { reactive, markRaw, defineAsyncComponent } from 'vue';
 import { getAssetURL } from '/@/utils/ui';
 import { useGlobSetting } from '/@/hooks/setting';
 
-
 export const getMaxY = function (param) {
-  console.log(param,'999999')
-  let maxval=0
+  console.log(param, '999999');
+  let maxval = 0;
   if (param.length == 1) {
-     maxval = Math.max(...param[0]);
+    maxval = Math.max(...param[0]);
   } else if (param.length == 2) {
     const max1 = Math.max(...param[0]);
     const max2 = Math.max(...param[1]);
-    maxval = Math.max(max1,max2)
+    maxval = Math.max(max1, max2);
   } else if (param.length == 3) {
     const max1 = Math.max(...param[0]);
     const max2 = Math.max(...param[1]);
     const max3 = Math.max(...param[2]);
-    maxval=Math.max(max1,max2,max3)
+    maxval = Math.max(max1, max2, max3);
   }
- let yMax = (maxval * 1.6).toFixed(0);
-// const digitCount = yMax.toFixed(0).length;
-// console.log(digitCount,'digitCount')
-// let digFirst=yMax.toString().substring(0,1)
-// console.log(digFirst,'digFirst')
-
+  const yMax = (maxval * 1.6).toFixed(0);
+  // const digitCount = yMax.toFixed(0).length;
+  // console.log(digitCount,'digitCount')
+  // let digFirst=yMax.toString().substring(0,1)
+  // console.log(digFirst,'digFirst')
 
   // const digitCount = maxval.toFixed(0).length;
   // console.log(digitCount,'digitCount')
@@ -67,24 +65,24 @@ export const getMaxY = function (param) {
   //     yMax = (n + 1) * 10000 + 5000;
   //   }
   // }
-  return yMax
-}
+  return yMax;
+};
 
 export const getMinY = function (param) {
-  let minval=0
+  let minval = 0;
   if (param.length == 1) {
     minval = Math.min(...param[0]);
   } else if (param.length == 2) {
     const min1 = Math.min(...param[0]);
     const min2 = Math.min(...param[1]);
-    minval=Math.min(min1,min2)
+    minval = Math.min(min1, min2);
   } else if (param.length == 3) {
     const min1 = Math.min(...param[0]);
     const min2 = Math.min(...param[1]);
     const min3 = Math.min(...param[2]);
-    minval=Math.min(min1,min2,min3)
+    minval = Math.min(min1, min2, min3);
   }
-  let yMin = (minval*0.7).toFixed(0);
+  const yMin = (minval * 0.7).toFixed(0);
   // const minDigitCount = minval.toFixed(0).length;
   // let yMin = 0;
   // if (minDigitCount < 2) {
@@ -126,9 +124,8 @@ export const getMinY = function (param) {
   //     yMin = 10000;
   //   }
   // }
-  return yMin
-}
-
+  return yMin;
+};
 
 //中间区域数据-通风
 export const centerAreaListT1 = [

src/views/vent/monitorManager/deviceCameraMonitor/index.vue

@@ -220,41 +220,28 @@
 
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted, ComponentOptions, shallowRef, reactive, defineProps, watch, nextTick,unref } from 'vue';
-import { SendOutlined, FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons-vue';
-import { list, getDeviceList, getDeviceTypeList, devPosition, getDepartmentInfo, getExportUrl } from './device.api';
+import { list, getDeviceList, getDepartmentInfo } from './device.api';
 import AlarmHistoryTable from '../comment/AlarmHistoryTable.vue';
 import HistoryTable from '../comment/HistoryTable.vue';
 import HistoryTableNew from '/@/views/vent/comment/history/HistoryTable.vue';
 import HandlerHistoryTable from '../comment/HandlerHistoryTable.vue';
 import MonitorTable from '../comment/MonitorTable.vue';
 import GroupMonitorTable from '../comment/GroupMonitorTable.vue';
-import gaspatrolTable from '../comment/gaspatrolTable.vue';
-import gasReport from '../comment/gasReport.vue';
-import gasReportCount from '../comment/gasReportCount.vue';
-import gasInspectDialog from '../comment/gasInspectDialog.vue';
-import { TreeProps, message, Progress, Input, Select } from 'ant-design-vue';
-import { TableAction } from '/@/components/Table';
-import { SvgIcon } from '/@/components/Icon';
+import { message, Progress, } from 'ant-design-vue';
 import { getActions } from '/@/qiankun/state';
 import { useRouter } from 'vue-router';
 import { setDivHeight } from '/@/utils/event';
 import { render } from '/@/utils/common/renderUtils';
 import HandleModal from './modal.vue';
 import {
-  majorColumns,
-  haveSysDetailArr,
-  haveDetailArr,
   haveHandlerArr,
   noWarningArr,
   surfaceChartsColumns,
   noHistoryArr,
-  vehicleFormConfig,
   noLocationArr,
 } from './device.data';
-import { formConfig } from '../safetyMonitor/safety.data';
 import { getDictItemsByCode } from '/@/utils/dict';
 import BarAndLine from '/@/components/chart/BarAndLine.vue';
-import MTreeSelect from '/@/components/Form/src/jeecg/components/MTreeSelect.vue';
 import { useMethods } from '/@/hooks/system/useMethods';
 import { useGo } from '/@/hooks/web/usePage';
 import { useGlobSetting } from '/@/hooks/setting';
@@ -289,13 +276,10 @@ const { hasPermission } = usePermission();
 const { getCamera, removeCamera, getPlayer } = useCamera();
 const playerRef = ref()
 const router = useRouter();
-const actions = getActions();
-const noLocationList = noLocationArr();
 const monitorTable = ref();
 const historyTable = ref();
 const alarmHistoryTable = ref();
 const handlerHistoryTable = ref();
-const isRefresh = ref(true);
 // 模态框
 const currentModal = shallowRef<Nullable<ComponentOptions>>(null); //模态框
 const modalVisible = ref<Boolean>(false); // 模态框是否可见
@@ -304,7 +288,6 @@ const tableShow = ref(true); //是否显示树形菜单
 const modalIsShow = ref<boolean>(false); // 是否显示模态框
 const modalTitle = ref(''); // 模态框标题显示内容，根据设备操作类型决定
 const modalType = ref(''); // 模态框内容显示类型，设备操作类型
-const locationList = ref([]); //巷道定位图标显示列表
 const deviceList = ref<DeviceType[]>([]); //关联设备列表
 const deviceActive = ref('');
 const activeKey = ref('1'); // tab key
@@ -315,24 +298,16 @@ const surfaceEchartsData = ref<any[]>(); // 工作面历史记录，echarts数
 const activeID = ref(''); // 打开详情modal时监测的设备id
 const deviceType = ref(''); // 监测设备类型
 const selectRowIndex = ref(-1)
-const systemType = ref('');
 const systemID = ref(''); // 系统监测时，系统id
 const cameraAddrs = ref([])
 const scroll = reactive({
   y: 180,
 });
 let departmentInfo: Null | Object = null;
-let startMonitorTimer = 0;
 let gaspatrol = ref(null);
 let gasreport = ref(null);
 let gasreportcount = ref(null);
 let station = ref(null);
-let gasSearch = reactive({
-  address: '',
-  userName: '',
-  insType: '2',
-  class: 'night',
-});
 function tabChange(activeKeyVal) {
   activeKey.value = activeKeyVal;
 }
@@ -569,14 +544,26 @@ async function getSelectRow(selectRow, index) {
   selectData.value = selectRow;
   cameraAddrs.value = await getCamera(selectRow.deviceID, playerRef.value, null, true);
   if(cameraAddrs.value && cameraAddrs.value.length > 0){
-    nextTick(() => {
+    nextTick(async() => {
       for(let i=0; i<cameraAddrs.value.length; i++){
         const item = cameraAddrs.value[i]
         const fileExtension = item.addr.split('.').pop();
-        if (item.addr.includes('0.0.0.0')) {
-          item.addr = item.addr.replace('0.0.0.0', window.location.hostname);
+        if (item['addr'] && item['addr'].includes('0.0.0.0')) {
+          item['addr'] = item['addr'].replace('0.0.0.0', window.location.hostname);
+        }
+        if(item['addr'].startsWith('rtsp://')) {
+          const videoDom = document.getElementById('video' + i);
+          if(videoDom){
+            const server = new window['WebRtcStreamer'](
+              videoDom,
+              VUE_APP_URL.webRtcUrl.startsWith('/') ? location.protocol + VUE_APP_URL.webRtcUrl : VUE_APP_URL.webRtcUrl
+            );
+            await server.connect(item['addr']);
+            videoDom.play();
+          }
+        }else{
+          getPlayer(fileExtension, 'player' + i,item['devicekind'], item['addr'], item['cameraRate'], {width: 755, height: 490})
         }
-        const player = getPlayer(fileExtension, 'player' + i,item.devicekind, item.addr, item.cameraRate, {width: 755, height: 490})
       }
     })
   }

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -472,9 +472,6 @@
               <template v-else-if="deviceType.startsWith('fanlocal')">
                 <HistoryTableNew class="w-100% hM-100%" :device-code="`${deviceType}`" :scroll="scroll" dict-code="fanlocal_dict" />
               </template>
-              <template v-else-if="deviceType.startsWith('majorpath')">
-                <HistoryTableMajorPath class="w-100% h-100%" :sysId="`${systemID}`" :scroll="scroll" columnsType="sys_majorpath" type="table" />
-              </template>
               <template v-else>
                 <HistoryTable ref="historyTable" :sysId="systemID" :columns-type="`${deviceType}`"
                   :device-type="deviceType" designScope="device-history" :scroll="scroll" />

src/views/vent/monitorManager/deviceMonitor/components/device/modal/gaspatrol.modal.vue

@@ -1,10 +1,21 @@
 <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>
@@ -17,8 +28,7 @@
             </div>
             <div class="item-container">
               <div class="title">氧气</div>
-              <div class="value">{{ posMonitor.o2 !== undefined && posMonitor.o2 !== null ? posMonitor.o2 : '-' }}
-                <span>%</span></div>
+              <div class="value">{{ posMonitor.o2 !== undefined && posMonitor.o2 !== null ? posMonitor.o2 : '-' }} <span>%</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -27,8 +37,7 @@
             </div>
             <div class="item-container">
               <div class="title">一氧化碳</div>
-              <div class="value">{{ posMonitor.co !== undefined && posMonitor.co !== null ? posMonitor.co : '-' }}
-                <span>ppm</span> </div>
+              <div class="value">{{ posMonitor.co !== undefined && posMonitor.co !== null ? posMonitor.co : '-' }} <span>ppm</span> </div>
             </div>
           </div>
           <div class="top-item">
@@ -37,8 +46,7 @@
             </div>
             <div class="item-container">
               <div class="title">二氧化碳</div>
-              <div class="value">{{ posMonitor.co2 !== undefined && posMonitor.co2 !== null ? posMonitor.co2 : '-' }}
-                <span>%</span></div>
+              <div class="value">{{ posMonitor.co2 !== undefined && posMonitor.co2 !== null ? posMonitor.co2 : '-' }} <span>%</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -47,8 +55,7 @@
             </div>
             <div class="item-container">
               <div class="title">甲烷</div>
-              <div class="value">{{ posMonitor.ch4 !== undefined && posMonitor.ch4 !== null ? posMonitor.ch4 : '-' }}
-                <span>%</span></div>
+              <div class="value">{{ posMonitor.ch4 !== undefined && posMonitor.ch4 !== null ? posMonitor.ch4 : '-' }} <span>%</span></div>
             </div>
           </div>
           <div class="top-item">
@@ -57,8 +64,9 @@
             </div>
             <div class="item-container">
               <div class="title">温度</div>
-              <div class="value">{{ posMonitor.temperature !== undefined && posMonitor.temperature !== null ?
-                posMonitor.temperature : '-' }} <span>℃</span></div>
+              <div class="value"
+                >{{ posMonitor.temperature !== undefined && posMonitor.temperature !== null ? posMonitor.temperature : '-' }} <span>℃</span></div
+              >
             </div>
           </div>
           <div class="top-item">
@@ -67,8 +75,9 @@
             </div>
             <div class="item-container">
               <div class="title">湿度</div>
-              <div class="value">{{ posMonitor.humidity !== undefined && posMonitor.humidity !== null ?
-                posMonitor.humidity : '-' }} <span>%</span></div>
+              <div class="value"
+                >{{ posMonitor.humidity !== undefined && posMonitor.humidity !== null ? posMonitor.humidity : '-' }} <span>%</span></div
+              >
             </div>
           </div>
 
@@ -78,7 +87,7 @@
             </div>
             <div class="item-container">
               <div class="title">传感器通讯</div>
-              <div class="warning-value">{{ posMonitor['deviceConnect'] == 1 ? '连接' : '未连接' }}</div>
+              <div class="warning-value">{{ posMonitor['deviceConnect'] == 1 ? '连接' : '-' }}</div>
             </div>
           </div>
           <div class="top-item warning-box">
@@ -94,8 +103,14 @@
         <div class="right-bottom">
           <span class="base-title">设备监测曲线</span>
           <div class="echarts-box">
-            <BarAndLine class="echarts-line" xAxisPropType="time" :dataSource="historyList" height="100%"
-              :chartsColumns="chartsColumns" :option="echatsOption" />
+            <BarAndLine
+              class="echarts-line"
+              xAxisPropType="time"
+              :dataSource="historyList"
+              height="100%"
+              :chartsColumns="chartsColumns"
+              :option="echatsOption"
+            />
           </div>
         </div>
       </div>
@@ -103,331 +118,331 @@
   </BasicModal>
 </template>
 <script lang="ts">
-import { defineComponent, ref, watch, shallowRef } from 'vue';
-import { BasicModal, useModalInner } from '/@/components/Modal';
-import BarAndLine from '/@/components/chart/BarAndLine.vue';
-import { SvgIcon } from '/@/components/Icon';
-import { Decoration7 as DvDecoration7, ScrollBoard as DvScrollBoard } from '@kjgl77/datav-vue3';
-import dayjs from 'dayjs';
-import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
-import { chartsColumnList } from '../device.data';
-
-export default defineComponent({
-  components: { BasicModal, BarAndLine, SvgIcon, DvScrollBoard, DvDecoration7 },
-  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: '25%',
-        left: '10',
-        right: '45',
-        bottom: '3%',
-        containLabel: true,
-      },
-      toolbox: {
-        feature: {},
-      },
-    };
-    const chartsColumnArr = getTableHeaderColumns('gaspatrol_chart');
-    const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
-
-    const [register, { setModalProps, closeModal }] = useModalInner();
-
-    function handleVisibleChange(visible) {
-      if (visible) {
+  import { defineComponent, ref, watch, shallowRef } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import BarAndLine from '/@/components/chart/BarAndLine.vue';
+  import { SvgIcon } from '/@/components/Icon';
+  import { Decoration7 as DvDecoration7, ScrollBoard as DvScrollBoard } from '@kjgl77/datav-vue3';
+  import dayjs from 'dayjs';
+  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+  import { chartsColumnList } from '../device.data';
+
+  export default defineComponent({
+    components: { BasicModal, BarAndLine, SvgIcon, DvScrollBoard, DvDecoration7 },
+    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: '25%',
+          left: '10',
+          right: '45',
+          bottom: '3%',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {},
+        },
+      };
+      const chartsColumnArr = getTableHeaderColumns('gaspatrol_chart');
+      const chartsColumns = chartsColumnArr.length > 0 ? chartsColumnArr : chartsColumnList;
+
+      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) {
         loading.value = true;
         setModalProps({ loading: true, confirmLoading: true });
-
         setTimeout(() => {
           loading.value = false;
+          activeDeviceID.value = id;
           setModalProps({ loading: false, confirmLoading: false });
-        }, 1000);
+        }, 300);
       }
-    }
-
-    // 选择监测
-    function selectDevice(id) {
-      loading.value = true;
-      setModalProps({ loading: true, confirmLoading: true });
-      setTimeout(() => {
-        loading.value = false;
-        activeDeviceID.value = id;
-        setModalProps({ loading: false, confirmLoading: false });
-      }, 300);
-    }
 
-    function handleOk(e) {
-      e.preventDefault();
-      closeModal();
-    }
-
-    function handleCancel(e) {
-      e.preventDefault();
-      closeModal();
-    }
+      function handleOk(e) {
+        e.preventDefault();
+        closeModal();
+      }
 
-    watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
-      if (newActiveID != oldActiveID) {
-        activeDeviceID.value = newActiveID as string;
+      function handleCancel(e) {
+        e.preventDefault();
+        closeModal();
       }
-      // 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);
-          historyList.value = item['history'];
+
+      watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
+        if (newActiveID != oldActiveID) {
+          activeDeviceID.value = newActiveID as string;
         }
-        item.readTime = item.readTime?.substring(11);
-        return item;
+        // 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);
+            historyList.value = item['history'];
+          }
+          item.readTime = item.readTime?.substring(11);
+          return item;
+        });
       });
-    });
-
-    return {
-      register,
-      model: modelRef,
-      currentTime,
-      handleVisibleChange,
-      selectDevice,
-      handleOk,
-      handleCancel,
-      deviceList,
-      historyList,
-      activeDeviceID,
-      posMonitor,
-      echatsOption,
-      posList,
-      chartsColumns,
-    };
-  },
-});
+
+      return {
+        register,
+        model: modelRef,
+        currentTime,
+        handleVisibleChange,
+        selectDevice,
+        handleOk,
+        handleCancel,
+        deviceList,
+        historyList,
+        activeDeviceID,
+        posMonitor,
+        echatsOption,
+        posList,
+        chartsColumns,
+      };
+    },
+  });
 </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;
 
-    .right-top {
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-      flex-wrap: wrap;
-      margin-bottom: 10px;
+        &::after {
+          content: '';
+          position: absolute;
+          display: block;
+          width: 4px;
+          height: 12px;
+          top: 4px;
+          left: 10px;
+          background: #45d3fd;
+          border-radius: 4px;
+        }
+      }
 
-      .top-item {
-        width: 220px;
-        height: 100px;
+      .right-top {
         display: flex;
         flex-direction: row;
-        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;
-        }
+        justify-content: space-between;
+        flex-wrap: wrap;
+        margin-bottom: 10px;
 
-        .item-container {
-          width: 110px;
+        .top-item {
+          width: 220px;
+          height: 100px;
           display: flex;
-          flex-direction: column;
+          flex-direction: row;
           justify-content: center;
-
-          div {
-            text-align: 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;
           }
 
-          .title {
-            font-size: 18px;
-          }
+          .item-container {
+            width: 110px;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+
+            div {
+              text-align: center;
+            }
 
-          .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;
+            .title {
               font-size: 18px;
-              color: aliceblue;
+            }
+
+            .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;
+              }
             }
           }
         }
-      }
 
-      .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;
+      .right-center {
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
 
-      .table-box {
-        position: relative;
-        width: 500px;
-        height: 250px;
-      }
+        .table-box {
+          position: relative;
+          width: 500px;
+          height: 250px;
+        }
 
-      .warning-box {
-        width: calc(100% - 520px);
+        .warning-box {
+          width: calc(100% - 520px);
 
-        .warning-container {
-          width: 100%;
-          height: convert;
-          background: #009acd00;
+          .warning-container {
+            width: 100%;
+            height: convert;
+            background: #009acd00;
 
-          :deep(.dv-scroll-board) {
-            .row-item {
-              height: 40px !important;
-              line-height: 40px !important;
-            }
+            :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;
+              .header-item {
+                border-top: 1px solid #91e9fe !important;
+                border-bottom: 1px solid #91e9fe !important;
+              }
             }
           }
         }
       }
-    }
 
-    .right-bottom {
-      margin-top: 20px;
+      .right-bottom {
+        margin-top: 20px;
 
-      .echarts-box {
-        width: 100%;
-        height: 320px;
-        position: relative;
+        .echarts-box {
+          width: 100%;
+          height: 320px;
+          position: relative;
 
-        .echarts-line {
-          width: calc(100% + 80px);
-          position: absolute;
+          .echarts-line {
+            width: calc(100% + 80px);
+            position: absolute;
+          }
         }
       }
     }
   }
-}
 
-:deep(.zxm-table-body) {
-  border: 1px solid rgba(57, 232, 255, 0.2) !important;
+  :deep(.zxm-table-body) {
+    border: 1px solid rgba(57, 232, 255, 0.2) !important;
 
-  .zxm-table-tbody>tr>td {
-    border: none !important;
+    .zxm-table-tbody > tr > td {
+      border: none !important;
+    }
   }
-}
 
-:deep(.zxm-table-cell) {
-  border-right: none !important;
-}
+  :deep(.zxm-table-cell) {
+    border-right: none !important;
+  }
 </style>

src/views/vent/monitorManager/nitrogen/nitrogen.data.1.ts

@@ -96,6 +96,8 @@ export async function getMonitorData() {
       return await import('./nitrogen.data.jh');
     case 'hnqymdktymk': //核桃峪
       return await import('./nitrogen.data.hty');
+    case 'sdmtjthlgmk': //核桃峪
+      return await import('./nitrogen.data.hty');
     default: //默认
       // return await import('./nitrogen.dataCc_2');
       // return await import('./nitrogen.data.hty');

src/views/vent/monitorManager/nitrogen/nitrogen.dataTest.ts

@@ -10,13 +10,13 @@ export const preMonitorList = [
   {
     title: '加载压力',
     code: 'PRE_CPR_LoadPre',
-    unit: 'MPa',
+    unit: 'bar',
     value: '76.76',
   },
   {
     title: '卸载压力',
     code: 'PRE_CPR_UnLoadPre',
-    unit: 'MPa',
+    unit: 'bar',
     child: [],
     value: '46.87',
   },
@@ -50,7 +50,7 @@ export const preMonitorList = [
   {
     title: '排气压力',
     code: 'PRE_CPR_ExhaustPre',
-    unit: 'MPa',
+    unit: 'bar',
     child: [],
     value: '19.54',
   },

src/views/vent/monitorManager/safetyMonitor/index.vue

@@ -32,8 +32,11 @@
                 <a-tag v-if="column.dataIndex === 'exceptionType_str'" :color="record.exceptionType_str == '正常' ? 'green' : '#f00'">
                   {{ record.exceptionType_str == '正常' ? '正常' : '异常' }}</a-tag
                 >
-                <a-tag v-if="column.dataIndex === 'netStatus_str'" :color="record.netStatus_str == '正常' ? 'green' : '#f00'">{{
-                  record.netStatus_str == '正常' ? '正常' : '异常'
+                <a-tag v-if="column.dataIndex === 'netStatus'" :color="record.netStatus == '1' ? 'green' : '#f00'">{{
+                  record.netStatus == '1' ? '正常' : '异常'
+                }}</a-tag>
+                <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == '0' ? 'green' : '#f00'">{{
+                  record.warnFlag == '0' ? '正常' : '异常'
                 }}</a-tag>
               </template>
             </MonitorTable>