Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/components/Form/src/jeecg/components/JImageUpload.vue

@@ -20,7 +20,7 @@
           <div class="ant-upload-text">{{ text }}</div>
         </div>
         <a-button v-if="listType == 'picture'" :disabled="disabled">
-          <UploadOutlined></UploadOutlined>
+          <UploadOutlined />
           {{ text }}
         </a-button>
       </div>
@@ -122,8 +122,8 @@
       watch(
         () => props.value,
         (val, prevCount) => {
-         //update-begin---author:liusq ---date:20230601  for：【issues/556】JImageUpload组件value赋初始值没显示图片------------
-            if (val && val instanceof Array) {
+          //update-begin---author:liusq ---date:20230601  for：【issues/556】JImageUpload组件value赋初始值没显示图片------------
+          if (val && val instanceof Array) {
             val = val.join(',');
           }
           if (initTag.value == true) {
@@ -216,8 +216,8 @@
       }
 
       function getAvatarView() {
-        if (uploadFileList.length > 0) {
-          let url = uploadFileList[0].url;
+        if (uploadFileList.value.length > 0) {
+          let url = uploadFileList.value[0].url;
           return getFileAccessHttpUrl(url, null);
         }
       }
@@ -247,7 +247,7 @@
 </script>
 <style scoped lang="less">
   @ventSpace: zxm;
-  
+
   .@{ventSpace}-upload-select-picture-card i {
     font-size: 32px;
     color: #999;

src/hooks/web/useWebColumns.ts

@@ -18,7 +18,7 @@ const arrToColumns = (tableHeaderColumns = []) => {
       dict: item.dict,
       // sorter: item.sort ? true : false,
       customRender: ({ text }) => {
-        return text == null || text == '' || text == undefined ? '-' : text;
+        return text === null || text === '' || text === undefined ? '-' : text;
       },
     };
     columns.push(columnsItem);

src/layouts/default/sider/index.vue

@@ -17,62 +17,62 @@
   <bottomSider2 v-if="noChatLink.includes(routePath)" />
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue';
+  import { defineComponent } from 'vue';
 
-import Sider from './LayoutSider.vue';
-import MixSider from './MixSider.vue';
-import BottomSider from './bottomSideder.vue';
-import bottomSider2 from './bottomSider2.vue';
-import { Drawer } from 'ant-design-vue';
+  import Sider from './LayoutSider.vue';
+  import MixSider from './MixSider.vue';
+  import BottomSider from './bottomSideder.vue';
+  import bottomSider2 from './bottomSider2.vue';
+  import { Drawer } from 'ant-design-vue';
 
-import { useAppInject } from '/@/hooks/web/useAppInject';
-import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
-import { useDesign } from '/@/hooks/web/useDesign';
-import { useRoute } from 'vue-router';
-import { noSiderLink, noChatLink } from '../layout.data';
-export default defineComponent({
-  name: 'SiderWrapper',
-  components: { Sider, Drawer, MixSider, BottomSider, bottomSider2 },
-  setup() {
-    const route = useRoute();
-    const { prefixCls } = useDesign('layout-sider-wrapper');
-    const { getIsMobile } = useAppInject();
-    const { setMenuSetting, getCollapsed, getMenuWidth, getIsMixSidebar, getIsBottomMenu, getIsBottomMenuH, getShowSidebar } = useMenuSetting();
-    function handleClose() {
-      setMenuSetting({
-        collapsed: true,
-      });
-    }
+  import { useAppInject } from '/@/hooks/web/useAppInject';
+  import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
+  import { useDesign } from '/@/hooks/web/useDesign';
+  import { useRoute } from 'vue-router';
+  import { noSiderLink, noChatLink } from '../layout.data';
+  export default defineComponent({
+    name: 'SiderWrapper',
+    components: { Sider, Drawer, MixSider, BottomSider, bottomSider2 },
+    setup() {
+      const route = useRoute();
+      const { prefixCls } = useDesign('layout-sider-wrapper');
+      const { getIsMobile } = useAppInject();
+      const { setMenuSetting, getCollapsed, getMenuWidth, getIsMixSidebar, getIsBottomMenu, getIsBottomMenuH, getShowSidebar } = useMenuSetting();
+      function handleClose() {
+        setMenuSetting({
+          collapsed: true,
+        });
+      }
 
-    return {
-      prefixCls,
-      getIsMobile,
-      getCollapsed,
-      handleClose,
-      getMenuWidth,
-      getIsMixSidebar,
-      getIsBottomMenu,
-      getIsBottomMenuH,
-      getShowSidebar,
-      routePath: route.path,
-      noSiderLink,
-      noChatLink,
-    };
-  },
-});
+      return {
+        prefixCls,
+        getIsMobile,
+        getCollapsed,
+        handleClose,
+        getMenuWidth,
+        getIsMixSidebar,
+        getIsBottomMenu,
+        getIsBottomMenuH,
+        getShowSidebar,
+        routePath: route.path,
+        noSiderLink,
+        noChatLink,
+      };
+    },
+  });
 </script>
 <style lang="less">
-@prefix-cls: ~'@{namespace}-layout-sider-wrapper';
-@ventSpace: zxm;
+  @prefix-cls: ~'@{namespace}-layout-sider-wrapper';
+  @ventSpace: zxm;
 
-.@{prefix-cls} {
-  .@{ventSpace}-drawer-body {
-    height: 100vh;
-    padding: 0;
-  }
+  .@{prefix-cls} {
+    .@{ventSpace}-drawer-body {
+      height: 100vh;
+      padding: 0;
+    }
 
-  .@{ventSpace}-drawer-header-no-title {
-    display: none;
+    .@{ventSpace}-drawer-header-no-title {
+      display: none;
+    }
   }
-}
 </style>

src/views/vent/bundle/bundleMonitorTable/bundle-table.data.ts

@@ -1199,3 +1199,100 @@ export const Yjlcolumns: BasicColumn[] = [
     align: 'center',
   },
 ];
+export const Cctrkcolumns: BasicColumn[] = [
+  {
+    title: '设备号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+  },
+  {
+    title: '采空区',
+    width: 100,
+    align: 'center',
+    dataIndex: 'ckq',
+    key: 'ckq',
+  },
+  {
+    title: '采样点',
+    width: 60,
+    align: 'center',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+  },
+  {
+    title: '检测时间',
+    dataIndex: 'qyfxsj',
+    key: 'qyfxsj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: 'O₂(%)',
+    dataIndex: 'o2_ave',
+    key: 'o2_ave',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: 'CO₂(%)',
+    dataIndex: 'co2_ave',
+    key: 'co2_ave',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: 'CO(PPM)',
+    dataIndex: 'co_ave',
+    key: 'co_ave',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: 'CH₄(%)',
+    dataIndex: 'ch4_ave',
+    key: 'ch4_ave',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: 'N₂(%)',
+    dataIndex: 'n2_ave',
+    key: 'n2_ave',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: 'C₂H₂(PPM)',
+    dataIndex: 'c2h2_ave',
+    key: 'c2h2_ave',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: 'C₂H₄(PPM)',
+    dataIndex: 'c2h4_ave',
+    key: 'c2h4_ave',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: 'C₂H₆(PPM)',
+    dataIndex: 'c2h6_ave',
+    key: 'c2h6_ave',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '煤自燃阶段',
+    dataIndex: 'internalFireWarnLevel',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 100,
+    align: 'center',
+  },
+];

src/views/vent/bundle/bundleMonitorTable/index.vue

@@ -50,7 +50,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted, computed, shallowRef, reactive, nextTick } from 'vue';
-import { columns, Hjtcolumns, Bdcolumns, Bltcolumns, Sgtcolumns, Yjlcolumns } from './bundle-table.data';
+import { columns, Hjtcolumns, Bdcolumns, Bltcolumns, Sgtcolumns, Yjlcolumns, Cctrkcolumns } from './bundle-table.data';
 import { getBundleInfoList, getAllFileList, getAllFileListById } from './bundle-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 // import { blastDelta } from './modal/blastDelta.vue';
@@ -94,8 +94,10 @@ const computedColumns = computed(() => {
       return Sgtcolumns; // 石圪台对应的列配置
     case 'sdmtjtyjlmk':
       return Yjlcolumns; // 榆家梁对应的列配置
+    case 'sdmtjtcctrk':
+      return Cctrkcolumns; // 寸草塔二矿对应的列配置
     default:
-      return Sgtcolumns; // 默认情况下返回的列配置
+      return columns; // 默认情况下返回的列配置
   }
 });
 function updateChart(data: any) {
@@ -108,6 +110,7 @@ function updateChart(data: any) {
   const c2h4MaxValues = data.map((item: any) => parseFloat(item.c2h4_max));
   const c2h4MinValues = data.map((item: any) => parseFloat(item.c2h4_min));
   const c2h4AveValues = data.map((item: any) => parseFloat(item.c2h4_ave));
+  const c2h6AveValues = data.map((item: any) => parseFloat(item.c2h6_ave));
   const ch4MaxValues = data.map((item: any) => parseFloat(item.ch4_max));
   const ch4MinValues = data.map((item: any) => parseFloat(item.ch4_min));
   const ch4AveValues = data.map((item: any) => parseFloat(item.ch4_ave));
@@ -539,47 +542,118 @@ function updateChart(data: any) {
       case 'sdmtjtyjlmk':
         return [
           {
-            name: 'O₂',
+            name: 'O₂最小值',
+            data: o2MinValues,
+            type: 'bar',
+          },
+          {
+            name: 'O₂平均值',
             data: o2AveValues,
-            yAxisIndex: 0,
             type: 'bar',
           },
           {
-            name: 'N₂',
+            name: 'N₂最大值',
+            data: n2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'N₂平均值',
             data: n2AveValues,
-            yAxisIndex: 0,
             type: 'bar',
           },
 
           {
-            name: 'CO',
+            name: 'CO最大值',
+            data: coMaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO平均值',
+            data: coAveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂最大值',
+            data: co2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂平均值',
+            data: co2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄最大值',
+            data: ch4MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄平均值',
+            data: ch4AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₄最大值',
+            data: c2h4MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₄平均值',
+            data: c2h4AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₂最大值',
+            data: c2h2MaxValues,
+            type: 'bar',
+          },
+          {
+            name: 'C₂H₂平均值',
+            data: c2h2AveValues,
+            type: 'bar',
+          },
+        ];
+      case 'sdmtjtcctrk':
+        return [
+          {
+            name: 'O₂平均值',
+            data: o2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'N₂平均值',
+            data: n2AveValues,
+            type: 'bar',
+          },
+          {
+            name: 'CO平均值',
             data: coAveValues,
-            yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'CO₂',
+            name: 'CO₂平均值',
             data: co2AveValues,
-            yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'CH₄',
+            name: 'CH₄平均值',
             data: ch4AveValues,
-            yAxisIndex: 1,
             type: 'bar',
           },
           {
-            name: 'C₂H₄',
+            name: 'C₂H₄平均值',
             data: c2h4AveValues,
             type: 'bar',
-            yAxisIndex: 1,
           },
           {
-            name: 'C₂H₂',
+            name: 'C₂H₂平均值',
             data: c2h2AveValues,
             type: 'bar',
-            yAxisIndex: 1,
+          },
+          {
+            name: 'C₂H₆平均值',
+            data: c2h6AveValues,
+            type: 'bar',
           },
         ];
       default:

src/views/vent/bundleSpy/bundleSpyTable/bundleSpy-table.data.ts

@@ -771,3 +771,139 @@ export const Yjlcolumns: BasicColumn[] = [
     align: 'center',
   },
 ];
+export const Cctrkcolumns: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+    key: 'xh',
+  },
+  {
+    title: '采空区名称',
+    dataIndex: 'ckq',
+    key: 'ckq',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '检查地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '密闭编号',
+    dataIndex: 'mbbh',
+    key: 'mbbh',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '闭内',
+    children: [
+      {
+        title: 'CH₄(%)',
+        dataIndex: 'ch4_ave',
+        key: 'ch4_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'O₂(%)',
+        dataIndex: 'o2_ave',
+        key: 'o2_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'CO(ppm)',
+        dataIndex: 'co_ave',
+        key: 'co_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'CO₂(%)',
+        dataIndex: 'co2_ave',
+        key: 'co2_ave',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '气温(℃)',
+        dataIndex: 'qw',
+        key: 'qw',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '水温(℃)',
+        dataIndex: 'sw',
+        key: 'sw',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '压差(Pa)',
+        dataIndex: 'yc',
+        key: 'yc',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '闭前',
+    children: [
+      {
+        title: 'CH₄(%)',
+        dataIndex: 'ch4_ave_bq',
+        key: 'ch4_ave_bq',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: 'O₂(%)',
+        dataIndex: 'o2_ave_bq',
+        key: 'o2_ave_bq',
+        width: 100,
+        align: 'center',
+      },
+    ],
+  },
+  {
+    title: '观测孔风流方向',
+    dataIndex: 'gckflfx',
+    key: 'gckflfx',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '密闭完好情况',
+    dataIndex: 'mbwhqk',
+    key: 'mbwhqk',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '备注',
+    dataIndex: 'smark',
+    key: 'smark',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '煤自燃阶段',
+    dataIndex: 'internalFireWarnLevel',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 100,
+    align: 'center',
+  },
+];

src/views/vent/bundleSpy/bundleSpyTable/index.vue

@@ -44,7 +44,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted, computed, reactive, shallowRef } from 'vue';
-import { columns, Hjtcolumns, Bdcolumns, Bltcolumns, Sgtcolumns, Yjlcolumns } from './bundleSpy-table.data';
+import { columns, Hjtcolumns, Bdcolumns, Bltcolumns, Sgtcolumns, Yjlcolumns, Cctrkcolumns } from './bundleSpy-table.data';
 import { getbundleSpyInfoList, getAllFileList, getAllFileListById } from './bundleSpy-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
 import * as echarts from 'echarts';
@@ -86,8 +86,10 @@ const computedColumns = computed(() => {
       return Sgtcolumns; // 石圪台对应的列配置
     case 'sdmtjtyjlmk':
       return Yjlcolumns; // 榆家梁对应的列配置
+    case 'sdmtjtcctrk':
+      return Cctrkcolumns; // 寸草塔二矿对应的列配置
     default:
-      return Bdcolumns; // 默认情况下返回的列配置
+      return columns; // 默认情况下返回的列配置
   }
 });
 
@@ -322,6 +324,45 @@ function updateChart(data: any) {
             yAxisIndex: 1,
           },
         ];
+      case 'sdmtjtcctrk':
+        return [
+          {
+            name: 'CH₄闭内',
+            data: ch4AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'O₂闭内',
+            data: ch4AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CO₂闭内',
+            data: co2AveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CO闭内',
+            data: coAveValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'CH₄闭前',
+            data: ch4AveBqValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+          {
+            name: 'O₂闭前',
+            data: o2AveBqValues,
+            yAxisIndex: 1,
+            type: 'bar',
+          },
+        ];
       default:
         return [
           {

src/views/vent/dust/dustMonitorTable/dust-table.data.ts

@@ -646,6 +646,63 @@ export const Yjlcolumns = [
     align: 'center',
   },
 ];
+export const Cctrkcolumns = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    dataIndex: 'xh',
+  },
+  {
+    title: '测定地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+    width: 150,
+    align: 'center',
+  },
+  {
+    title: '粉尘种类',
+    dataIndex: 'fczl',
+    key: 'fczl',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '作业环境(工序)',
+    dataIndex: 'zyhj',
+    key: 'zyhj',
+    width: 80,
+    align: 'center',
+  },
+  {
+    title: '总粉尘(短时间检查浓度，mg/m³)',
+    dataIndex: 'zcjqpj',
+    key: 'zcjqpj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '呼吸性粉尘(短时间检查浓度，mg/m³)',
+    dataIndex: 'hcjqpj',
+    key: 'hcjqpj',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '总尘容许浓度(短时间监测浓度，mg/m³)',
+    dataIndex: 'zcrxnd',
+    key: 'zcrxnd',
+    width: 100,
+    align: 'center',
+  },
+  {
+    title: '呼尘容许浓度(短时间监测浓度，mg/m³)',
+    dataIndex: 'hcrxnd',
+    key: 'hcrxnd',
+    width: 100,
+    align: 'center',
+  },
+];
 //监测字段
 export const fieldMapping = {
   sc_zcds: '总尘-作业工序-生产(短时间监测浓度，mg/m³)',
@@ -695,6 +752,12 @@ export const fieldYjlMapping = {
   zcfcnd: '总粉尘(粉尘浓度，mg/m³)',
   hcfcnd: '呼尘(粉尘浓度，mg/m³)',
 };
+export const fieldCctrkMapping = {
+  zcjqpj: '总粉尘(短时间检查浓度，mg/m³)',
+  hcjqpj: '呼吸性粉尘(短时间检查浓度，mg/m³)',
+  zcrxnd: '总尘容许浓度(短时间监测浓度，mg/m³)',
+  hcrxnd: '呼尘容许浓度(短时间监测浓度，mg/m³)',
+};
 // 检测地点
 export const dataColumns = [
   {
@@ -951,6 +1014,37 @@ export const dataYjlColumns = [
     key: 'zyhj',
   },
 ];
+export const dataCctrkColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 100,
+    customRender: ({ text }) => fieldCctrkMapping[text] || text,
+  },
+  {
+    title: '最大值',
+    dataIndex: 'value',
+    align: 'center',
+    width: 100,
+    key: 'value',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '监测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '作业环境(工序)',
+    dataIndex: 'zyhj',
+    key: 'zyhj',
+  },
+];
 // 当日情况粉尘情况分析
 export const AllDataColumns = [
   {
@@ -1221,3 +1315,34 @@ export const AllDataYjlColumns = [
     key: 'zyhj',
   },
 ];
+export const AllDataCctrkColumns = [
+  {
+    title: '监测字段',
+    align: 'center',
+    dataIndex: 'key',
+    key: 'key',
+    width: 100,
+    customRender: ({ text }) => fieldCctrkMapping[text] || text,
+  },
+  {
+    title: '最大值',
+    dataIndex: 'value',
+    align: 'center',
+    width: 100,
+    key: 'value',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '监测地点',
+    dataIndex: 'jcdd',
+    key: 'jcdd',
+  },
+  {
+    width: 100,
+    align: 'center',
+    title: '作业环境(工序)',
+    dataIndex: 'zyhj',
+    key: 'zyhj',
+  },
+];

src/views/vent/dust/dustMonitorTable/index.vue

@@ -71,6 +71,7 @@ import {
   Bltcolumns,
   Sgtcolumns,
   Yjlcolumns,
+  Cctrkcolumns,
   dataColumns,
   dataDltColumns,
   dataSwColumns,
@@ -79,6 +80,7 @@ import {
   dataBltColumns,
   dataSgtColumns,
   dataYjlColumns,
+  dataCctrkColumns,
   AllDataColumns,
   AllDataDltColumns,
   AllDataSwColumns,
@@ -87,6 +89,7 @@ import {
   AllDataBltColumns,
   AllDataSgtColumns,
   AllDataYjlColumns,
+  AllDataCctrkColumns,
 } from './dust-table.data';
 import { getDustInfoList, getAllFileList, getAllFileListById } from './dsut-table.api';
 import customHeader from '/@/components/vent/customHeader.vue';
@@ -135,6 +138,8 @@ const computedColumns = computed(() => {
       return Sgtcolumns; // 石圪台对应的列配置
     case 'sdmtjtyjlmk':
       return Yjlcolumns; // 榆家梁对应的列配置
+    case 'sdmtjtcctrk':
+      return Cctrkcolumns; // 寸草塔二矿对应的列配置
     default:
       return columns; // 默认情况下返回的列配置
   }
@@ -157,6 +162,8 @@ const AllDataComputedColumns = computed(() => {
       return AllDataSgtColumns; // 石圪台对应的列配置
     case 'sdmtjtyjlmk':
       return AllDataYjlColumns; // 榆家梁对应的列配置
+    case 'sdmtjtcctrk':
+      return AllDataCctrkColumns; // 寸草塔二矿对应的列配置
     default:
       return AllDataColumns; // 默认情况下返回的列配置
   }
@@ -177,8 +184,10 @@ const DataComputedColumns = computed(() => {
       return dataBltColumns; // 补连塔对应的列配置
     case 'sdmtjtsgtmk':
       return dataSgtColumns; // 石圪台对应的列配置
-      case 'sdmtjtyjlmk':
+    case 'sdmtjtyjlmk':
       return dataYjlColumns; // 榆家梁对应的列配置
+    case 'sdmtjtcctrk':
+      return dataCctrkColumns; // 寸草塔二矿对应的列配置
     default:
       return dataColumns; // 默认情况下返回的列配置
   }
@@ -270,6 +279,12 @@ function processTableData(data: any) {
       { key: 'zcfcnd', value: -Infinity, gz: '', jcdd: '', scgy: '', gzcs: workplace },
       { key: 'hcfcnd', value: -Infinity, gz: '', jcdd: '', scgy: '', gzcs: workplace },
     ];
+    const CctrkMaxValues = [
+      { key: 'zcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'hcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'zcrxnd', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+      { key: 'hcrxnd', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: workplace },
+    ];
     items.forEach((item: any) => {
       maxValues.forEach((maxValue) => {
         if (item[maxValue.key] > maxValue.value) {
@@ -333,6 +348,15 @@ function processTableData(data: any) {
           maxValue.gzcs = item.gzcs;
         }
       });
+      CctrkMaxValues.forEach((maxValue) => {
+        if (item[maxValue.key] > maxValue.value) {
+          maxValue.value = item[maxValue.key];
+          maxValue.gz = item.gz;
+          maxValue.jcdd = item.jcdd;
+          maxValue.fczl = item.fczl;
+          maxValue.gzcs = item.gzcs;
+        }
+      });
     });
     switch (sysOrgCode) {
       case 'sdmtjtbetmk':
@@ -349,8 +373,10 @@ function processTableData(data: any) {
         return BltMaxValues; // 补连塔对应的列配置
       case 'sdmtjtsgtmk':
         return BltMaxValues; // 石圪台对应的列配置
-        case 'sdmtjtyjlmk':
+      case 'sdmtjtyjlmk':
         return YjlMaxValues; // 榆家梁对应的列配置
+      case 'sdmtjtcctrk':
+        return CctrkMaxValues; // 寸草塔二矿对应的列配置
       default:
         return maxValues; // 默认情况下返回的列配置
     }
@@ -403,9 +429,15 @@ function processTableData(data: any) {
     { key: 'sc_hcds', value: -Infinity, gz: '', jcdd: '', scgy: '', gzcs: '' },
   ];
   const overallYjlMaxValues = [
-      { key: 'zcfcnd', value: -Infinity, gz: '', jcdd: '', scgy: '', gzcs: workplace },
-      { key: 'hcfcnd', value: -Infinity, gz: '', jcdd: '', scgy: '', gzcs: workplace },
-    ];
+    { key: 'zcfcnd', value: -Infinity, gz: '', jcdd: '', scgy: '', gzcs: '' },
+    { key: 'hcfcnd', value: -Infinity, gz: '', jcdd: '', scgy: '', gzcs: '' },
+  ];
+  const overallCctrkMaxValues = [
+    { key: 'zcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    { key: 'hcjqpj', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    { key: 'zcrxnd', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+    { key: 'hcrxnd', value: -Infinity, gz: '', jcdd: '', fczl: '', gzcs: '' },
+  ];
   data.forEach((item: any) => {
     overallMaxValues.forEach((maxValue) => {
       if (item[maxValue.key] > maxValue.value) {
@@ -470,6 +502,15 @@ function processTableData(data: any) {
         maxValue.gzcs = item.gzcs;
       }
     });
+    overallCctrkMaxValues.forEach((maxValue) => {
+      if (item[maxValue.key] > maxValue.value) {
+        maxValue.value = item[maxValue.key];
+        maxValue.gz = item.gz;
+        maxValue.jcdd = item.jcdd;
+        maxValue.fczl = item.fczl;
+        maxValue.gzcs = item.gzcs;
+      }
+    });
   });
   AllMaxValues = computed(() => {
     switch (sysOrgCode) {
@@ -487,8 +528,10 @@ function processTableData(data: any) {
         return overallBltMaxValues; // 补连塔对应的列配置
       case 'sdmtjtsgtmk':
         return overallBltMaxValues; // 石圪台对应的列配置
-        case 'sdmtjtyjlmk':
+      case 'sdmtjtyjlmk':
         return overallYjlMaxValues; // 榆家梁对应的列配置
+      case 'sdmtjtcctrk':
+        return overallCctrkMaxValues; // 寸草塔二矿对应的列配置
       default:
         return overallMaxValues; // 默认情况下返回的列配置
     }

src/views/vent/monitorManager/comment/AlarmHistoryTable.vue

@@ -6,11 +6,14 @@
       </template>
 
       <template #bodyCell="{ column, record }">
-        <template v-if="column.dataIndex === 'nwartype'">
+        <template v-if="column.dict">
           <!-- 除了 101（蓝色预警）其他都是红色字体 -->
-          <span :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+          <span v-if="column.dataIndex === 'nwartype'" :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
             {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
           </span>
+          <span v-else>
+            {{ render.renderDictText(record[column.dataIndex], column.dict) || '-' }}
+          </span>
         </template>
       </template>
     </BasicTable>

src/views/vent/monitorManager/comment/FanDeviceEcharts.vue

@@ -177,291 +177,291 @@
   </div>
 </template>
 <script lang="ts">
-import { ref, defineComponent, watch, reactive, onMounted, watchEffect, inject } from 'vue';
-import BarAndLine from '/@/components/chart/BarAndLine.vue';
-import dayjs from 'dayjs';
-import { defHttp } from '/@/utils/http/axios';
-import { Select, Pagination } from 'ant-design-vue';
+  import { ref, defineComponent, watch, reactive, onMounted, watchEffect, inject } from 'vue';
+  import BarAndLine from '/@/components/chart/BarAndLine.vue';
+  import dayjs from 'dayjs';
+  import { defHttp } from '/@/utils/http/axios';
+  import { Select, Pagination } from 'ant-design-vue';
 
-export default defineComponent({
-  name: 'DeviceEcharts',
-  components: { BarAndLine, Select, Pagination },
-  props: {
-    fan1ChartsColumns: {
-      type: Array,
-      default: () => [],
-    },
-    fan2ChartsColumns: {
-      type: Array,
-      default: () => [],
-    },
-    chartsColumnsHistory: {
-      type: Array,
-      default: () => [],
-    },
-    chartsColumnsType: {
-      type: String,
-      required: true,
-    },
-    dataSource: {
-      type: Array,
-      default: () => [],
-    },
-    deviceListApi: {
-      type: Function,
-      required: true,
-    },
-    deviceType: {
-      type: String,
-      required: true,
-    },
-    option: {
-      type: Object,
-      default: () => ({}),
-    },
-    xAxisPropType: {
-      type: String,
-      required: true,
-    },
-  },
-  setup(props) {
-    const globalConfig = inject('globalConfig');
-    let historyList;
-    const chartsType = ref('history');
-    const deviceId = ref('');
-    const options = ref([]);
-    const historyParams = reactive({
-      ttime_begin: dayjs().startOf('date').format('YYYY-MM-DD HH:mm:ss'),
-      ttime_end: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      skip: '8',
-      startTime: dayjs().startOf('date').format('YYYY-MM-DD HH:mm:ss'),
-      endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      interval: '1h',
-    });
-    const resultXAxisPropType = ref('');
-    const resultDataSource = ref<any[]>([]);
-    const detailDataSource = ref<any[]>([]);
-    const currentPage = ref<number>(1);
-    const pageSize = ref<number>(20);
-    const total = ref(0);
-
-    const echartsOption = {
-      grid: {
-        top: '50px',
-        left: '10px',
-        right: props.fan1ChartsColumns.length * 15 + 'px',
-        bottom: '15px',
-        containLabel: true,
+  export default defineComponent({
+    name: 'DeviceEcharts',
+    components: { BarAndLine, Select, Pagination },
+    props: {
+      fan1ChartsColumns: {
+        type: Array,
+        default: () => [],
       },
-      toolbox: {
-        feature: {},
+      fan2ChartsColumns: {
+        type: Array,
+        default: () => [],
       },
-      xAxis: {
-        axisLabel: {
-          interval: 0,
-        },
+      chartsColumnsHistory: {
+        type: Array,
+        default: () => [],
       },
-    };
-    const echartsOption1 = {
-      grid: {
-        top: '60px',
-        left: '10px',
-        right: props.fan1ChartsColumns.length * 15 + 'px',
-        bottom: '35px',
-        containLabel: true,
+      chartsColumnsType: {
+        type: String,
+        required: true,
       },
-      toolbox: {
-        feature: {},
+      dataSource: {
+        type: Array,
+        default: () => [],
       },
-      legend: {
-        top: 30,
+      deviceListApi: {
+        type: Function,
+        required: true,
       },
-      xAxis: {
-        interval: 0,
+      deviceType: {
+        type: String,
+        required: true,
       },
-    };
-    const echartsOption2 = {
-      grid: {
-        top: '70px',
-        left: '10px',
-        right: props.fan1ChartsColumns.length * 15 + 'px',
-        bottom: '5px',
-        containLabel: true,
+      option: {
+        type: Object,
+        default: () => ({}),
       },
-      toolbox: {
-        feature: {},
+      xAxisPropType: {
+        type: String,
+        required: true,
       },
-    };
+    },
+    setup(props) {
+      const globalConfig = inject('globalConfig');
+      let historyList;
+      const chartsType = ref('history');
+      const deviceId = ref('');
+      const options = ref([]);
+      const historyParams = reactive({
+        ttime_begin: dayjs().startOf('date').format('YYYY-MM-DD HH:mm:ss'),
+        ttime_end: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        skip: '8',
+        startTime: dayjs().startOf('date').format('YYYY-MM-DD HH:mm:ss'),
+        endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        interval: '1h',
+      });
+      const resultXAxisPropType = ref('');
+      const resultDataSource = ref<any[]>([]);
+      const detailDataSource = ref<any[]>([]);
+      const currentPage = ref<number>(1);
+      const pageSize = ref<number>(20);
+      const total = ref(0);
+
+      const echartsOption = {
+        grid: {
+          top: '50px',
+          left: '10px',
+          right: props.fan1ChartsColumns.length * 15 + 'px',
+          bottom: '15px',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {},
+        },
+        xAxis: {
+          axisLabel: {
+            interval: 0,
+          },
+        },
+      };
+      const echartsOption1 = {
+        grid: {
+          top: '60px',
+          left: '10px',
+          right: props.fan1ChartsColumns.length * 15 + 'px',
+          bottom: '35px',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {},
+        },
+        legend: {
+          top: 30,
+        },
+        xAxis: {
+          interval: 0,
+        },
+      };
+      const echartsOption2 = {
+        grid: {
+          top: '70px',
+          left: '10px',
+          right: props.fan1ChartsColumns.length * 15 + 'px',
+          bottom: '5px',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {},
+        },
+      };
 
-    const onChange = (pageNumber: number) => {
-      console.log('Page: ', pageNumber);
-    };
+      const onChange = (pageNumber: number) => {
+        console.log('Page: ', pageNumber);
+      };
 
-    watch(
-      [chartsType, deviceId, historyParams, pageSize, currentPage],
-      async (
-        [newChartsType, newDeviceId, newHistoryParams, newPageSize, newCurrentPage],
-        [oldChartsType, oldDeviceId, oldHistoryParams, oldPageSize, oldCurrentPage]
-      ) => {
-        console.log('[ historyParams ] >', historyParams.ttime, dayjs(historyParams.ttime).format('HH:mm:ss'));
-        if (newChartsType === 'listMonitor') {
-          // 实时监测所有
-          resultDataSource.value = props.dataSource;
-        } else if (newChartsType === 'history') {
-          resultDataSource.value = [];
-          // 历史
-          if (newChartsType !== oldChartsType || newDeviceId !== oldDeviceId) {
-            currentPage.value = 1;
-          }
-          const device = options.value.find((device) => device['deviceID'] === newDeviceId);
-          if (device) {
-            let res;
-            if (props.dataSource['stationtype'] !== 'redis') {
-              resultXAxisPropType.value = 'ttime';
-              historyList = (params) => defHttp.get({ url: '/safety/ventanalyMonitorData/listdays', params });
-              const datas = await historyList({
-                ttime_begin: newHistoryParams.ttime_begin,
-                ttime_end: newHistoryParams.ttime_end,
-                strtype: device.deviceType,
-                gdeviceid: newDeviceId,
-                skip: historyParams.skip,
-                pageSize: pageSize.value,
-                pageNo: currentPage.value,
-                column: 'createTime',
-              });
-              res = datas['datalist']['records'];
-              if (res && res.length > 0) {
-                resultDataSource.value = res.map((item) => Object.assign(item, item.readData));
-              } else {
-                resultDataSource.value = [];
-              }
-              total.value = datas['datalist'].total;
-            } else {
-              historyList = (params) => defHttp.post({ url: '/monitor/history/getHistoryData', params });
-              resultXAxisPropType.value = 'time';
-              res = await historyList({
-                pageSize: pageSize.value,
-                pageNum: currentPage.value,
-                startTime: newHistoryParams.ttime_begin,
-                endTime: newHistoryParams.ttime_end,
-                deviceId: newDeviceId,
-                strtype: device.deviceType,
-                interval: historyParams.interval,
-                column: 'createTime',
-              });
-              if (res && res.records && res.records.length > 0) {
-                resultDataSource.value = res.records.map((item) => Object.assign(item, item.readData));
+      watch(
+        [chartsType, deviceId, historyParams, pageSize, currentPage],
+        async (
+          [newChartsType, newDeviceId, newHistoryParams, newPageSize, newCurrentPage],
+          [oldChartsType, oldDeviceId, oldHistoryParams, oldPageSize, oldCurrentPage]
+        ) => {
+          console.log('[ historyParams ] >', historyParams.ttime, dayjs(historyParams.ttime).format('HH:mm:ss'));
+          if (newChartsType === 'listMonitor') {
+            // 实时监测所有
+            resultDataSource.value = props.dataSource;
+          } else if (newChartsType === 'history') {
+            resultDataSource.value = [];
+            // 历史
+            if (newChartsType !== oldChartsType || newDeviceId !== oldDeviceId) {
+              currentPage.value = 1;
+            }
+            const device = options.value.find((device) => device['deviceID'] === newDeviceId);
+            if (device) {
+              let res;
+              if (props.dataSource['stationtype'] !== 'redis') {
+                resultXAxisPropType.value = 'ttime';
+                historyList = (params) => defHttp.get({ url: '/safety/ventanalyMonitorData/listdays', params });
+                const datas = await historyList({
+                  ttime_begin: newHistoryParams.ttime_begin,
+                  ttime_end: newHistoryParams.ttime_end,
+                  strtype: device.deviceType,
+                  gdeviceid: newDeviceId,
+                  skip: historyParams.skip,
+                  pageSize: pageSize.value,
+                  pageNo: currentPage.value,
+                  column: 'createTime',
+                });
+                res = datas['datalist']['records'];
+                if (res && res.length > 0) {
+                  resultDataSource.value = res.map((item) => Object.assign(item, item.readData));
+                } else {
+                  resultDataSource.value = [];
+                }
+                total.value = datas['datalist'].total;
               } else {
-                resultDataSource.value = [];
+                historyList = (params) => defHttp.post({ url: '/monitor/history/getHistoryData', params });
+                resultXAxisPropType.value = 'time';
+                res = await historyList({
+                  pageSize: pageSize.value,
+                  pageNum: currentPage.value,
+                  startTime: newHistoryParams.ttime_begin,
+                  endTime: newHistoryParams.ttime_end,
+                  deviceId: newDeviceId,
+                  strtype: device.deviceType,
+                  interval: historyParams.interval,
+                  column: 'createTime',
+                });
+                if (res && res.records && res.records.length > 0) {
+                  resultDataSource.value = res.records.map((item) => Object.assign(item, item.readData));
+                } else {
+                  resultDataSource.value = [];
+                }
+                total.value = res.total;
               }
-              total.value = res.total;
             }
-          }
-        } else if (newChartsType === 'detail') {
-          // 设备详情
-          resultXAxisPropType.value = 'readTime';
-          if (newDeviceId !== oldDeviceId) {
-            detailDataSource.value = [];
+          } else if (newChartsType === 'detail') {
+            // 设备详情
+            resultXAxisPropType.value = 'readTime';
+            if (newDeviceId !== oldDeviceId) {
+              detailDataSource.value = [];
+            }
           }
         }
-      }
-    );
-    watchEffect(() => {
-      if (chartsType.value === 'detail') {
-        const currentData = props.dataSource.find((item: any) => item.deviceID === deviceId.value);
-        if (currentData) {
-          const isHas = detailDataSource.value.find((item) => item[resultXAxisPropType.value] === currentData[resultXAxisPropType.value]);
-          if (!isHas) {
-            if (detailDataSource.value.length < 15) {
-              detailDataSource.value.push(currentData);
-            } else {
-              detailDataSource.value.shift();
-              detailDataSource.value.push(currentData);
+      );
+      watchEffect(() => {
+        if (chartsType.value === 'detail') {
+          const currentData = props.dataSource.find((item: any) => item.deviceID === deviceId.value);
+          if (currentData) {
+            const isHas = detailDataSource.value.find((item) => item[resultXAxisPropType.value] === currentData[resultXAxisPropType.value]);
+            if (!isHas) {
+              if (detailDataSource.value.length < 15) {
+                detailDataSource.value.push(currentData);
+              } else {
+                detailDataSource.value.shift();
+                detailDataSource.value.push(currentData);
+              }
             }
           }
         }
-      }
-    });
+      });
 
-    onMounted(async () => {
-      const res = await props.deviceListApi();
-      // debugger;
-      if (res['msgTxt'] && res['msgTxt'][0] && res['msgTxt'][0]['datalist']) {
-        options.value = res['msgTxt'][0]['datalist'];
-        deviceId.value = options.value[0]['deviceID'];
-      }
-    });
+      onMounted(async () => {
+        const res = await props.deviceListApi();
+        // debugger;
+        if (res['msgTxt'] && res['msgTxt'][0] && res['msgTxt'][0]['datalist']) {
+          options.value = res['msgTxt'][0]['datalist'];
+          deviceId.value = options.value[0]['deviceID'];
+        }
+      });
 
-    return {
-      chartsType,
-      deviceId,
-      resultDataSource,
-      historyParams,
-      options,
-      resultXAxisPropType,
-      detailDataSource,
-      currentPage,
-      pageSize,
-      total,
-      echartsOption,
-      echartsOption1,
-      echartsOption2,
-      onChange,
-      globalConfig,
-    };
-  },
-});
+      return {
+        chartsType,
+        deviceId,
+        resultDataSource,
+        historyParams,
+        options,
+        resultXAxisPropType,
+        detailDataSource,
+        currentPage,
+        pageSize,
+        total,
+        echartsOption,
+        echartsOption1,
+        echartsOption2,
+        onChange,
+        globalConfig,
+      };
+    },
+  });
 </script>
 <style lang="less">
-:deep(.vent-select-dropdown) {
-  color: #000 !important;
-  .vent-select-item {
+  :deep(.vent-select-dropdown) {
     color: #000 !important;
+    .vent-select-item {
+      color: #000 !important;
+    }
   }
-}
 </style>
 <style lang="less" scoped>
-@import '/@/design/theme.less';
-.charts-container {
-  position: relative;
-  height: 100%;
-  .charts-box {
-    width: 100%;
+  @import '/@/design/theme.less';
+  .charts-container {
+    position: relative;
     height: 100%;
-    position: absolute;
-    bottom: 0;
-    top: 0px;
-    .echarts-group {
+    .charts-box {
+      width: 100%;
       height: 100%;
-      display: flex;
-      :deep(div) {
-        border-right: 1px solid #ffffff22 !important;
+      position: absolute;
+      bottom: 0;
+      top: 0px;
+      .echarts-group {
+        height: 100%;
+        display: flex;
+        :deep(div) {
+          border-right: 1px solid #ffffff22 !important;
+        }
       }
     }
-  }
 
-  .@{ventSpace}-picker,
-  .@{ventSpace}-select-selector {
-    background: #00000017 !important;
-    border: 1px solid @vent-form-item-border !important;
-    input,
-    .@{ventSpace}-select-selection-item,
-    .@{ventSpace}-picker-suffix {
-      color: #fff !important;
+    .@{ventSpace}-picker,
+    .@{ventSpace}-select-selector {
+      background: #00000017 !important;
+      border: 1px solid @vent-form-item-border !important;
+      input,
+      .@{ventSpace}-select-selection-item,
+      .@{ventSpace}-picker-suffix {
+        color: #fff !important;
+      }
+      .@{ventSpace}-select-selection-placeholder {
+        color: #b7b7b7 !important;
+      }
     }
-    .@{ventSpace}-select-selection-placeholder {
-      color: #b7b7b7 !important;
+    .@{ventSpace}-select-arrow,
+    .@{ventSpace}-picker-separator {
+      color: #fff !important;
     }
   }
-  .@{ventSpace}-select-arrow,
-  .@{ventSpace}-picker-separator {
-    color: #fff !important;
-  }
-}
-:deep(.@{ventSpace}-select-dropdown) {
-  color: #000 !important;
-  .@{ventSpace}-select-item {
+  :deep(.@{ventSpace}-select-dropdown) {
     color: #000 !important;
+    .@{ventSpace}-select-item {
+      color: #000 !important;
+    }
   }
-}
 </style>

src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -47,7 +47,7 @@ export const locationList = [
 
 export function getMonitorComponent() {
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtsgtmk';
+  // const sysOrgCode = 'sdmtjtswmk';
   let FiberModal;
   switch (sysOrgCode) {
     case 'sdmtjtsgtmk': //石圪台
@@ -66,9 +66,13 @@ export function getMonitorComponent() {
     case 'sdmtjtbetmk': //布尔台
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
       break;
+    case 'sdmtjtyjlmk': //榆家梁
+    case 'sdmtjtswmk': //上湾
+      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
+      break;
     default:
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.hlg.vue'));
-      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
+    // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.cct.vue'));

src/views/vent/monitorManager/deviceMonitor/components/device/modal/fiber.modal-Gx.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>
@@ -13,12 +24,13 @@
         <div class="right-top">
           <div class="top-item">
             <div class="icon">
-              <SvgIcon class="icon-style" name="aveg-temperature" style="width: 72px; height: 46px; " />
+              <SvgIcon class="icon-style" name="aveg-temperature" style="width: 72px; height: 46px" />
             </div>
             <div class="item-container">
               <div class="title">平均温度</div>
-              <div class="value">{{ posMonitor.avgtemperature !== undefined && posMonitor.avgtemperature !== null ?
-                posMonitor.avgtemperature : '-' }} <span>°C</span> </div>
+              <div class="value"
+                >{{ posMonitor.avgtemperature !== undefined && posMonitor.avgtemperature !== null ? posMonitor.avgtemperature : '-' }} <span>°C</span>
+              </div>
             </div>
           </div>
           <div class="top-item">
@@ -27,8 +39,10 @@
             </div>
             <div class="item-container">
               <div class="title">最高温度</div>
-              <div class="value">{{ posMonitor.hightemperature !== undefined && posMonitor.hightemperature !== null ?
-                posMonitor.hightemperature : '-' }} <span>°C</span></div>
+              <div class="value"
+                >{{ posMonitor.hightemperature !== undefined && posMonitor.hightemperature !== null ? posMonitor.hightemperature : '-' }}
+                <span>°C</span></div
+              >
             </div>
           </div>
           <div class="top-item">
@@ -37,8 +51,9 @@
             </div>
             <div class="item-container">
               <div class="title">最高温度位置</div>
-              <div class="value">{{ posMonitor.highposition !== undefined && posMonitor.highposition !== null ?
-                posMonitor.highposition : '-' }} <span>m</span></div>
+              <div class="value"
+                >{{ posMonitor.highposition !== undefined && posMonitor.highposition !== null ? posMonitor.highposition : '-' }} <span>m</span></div
+              >
             </div>
           </div>
           <div class="top-item">
@@ -47,8 +62,10 @@
             </div>
             <div class="item-container">
               <div class="title">报警阈值</div>
-              <div class="value">{{ posMonitor.warnthreshold !== undefined && posMonitor.warnthreshold !== null ?
-                posMonitor.warnthreshold : '-' }} <span>°C</span></div>
+              <div class="value"
+                >{{ posMonitor.warnthreshold !== undefined && posMonitor.warnthreshold !== null ? posMonitor.warnthreshold : '-' }}
+                <span>°C</span></div
+              >
             </div>
           </div>
           <div class="top-item warning-box">
@@ -57,13 +74,25 @@
             </div>
             <div class="item-container">
               <div class="title">报警状态</div>
-              <div :class="{
-                value1: posMonitor['warnstate'] == '0',
-                value2: posMonitor['warnstate'] == '1',
-                value5: posMonitor['warnstate'] == '2',
-                value3: posMonitor['warnstate'] == '3',
-              }">{{ posMonitor['warnstate'] == '0' ? '无报警' : posMonitor['warnstate'] == '1' ? '定温' :
-                posMonitor['warnstate'] == '2' ? '差温' : posMonitor['warnstate'] == '3' ? '预报警' : '--' }}</div>
+              <div
+                :class="{
+                  value1: posMonitor['warnstate'] == '0',
+                  value2: posMonitor['warnstate'] == '1',
+                  value5: posMonitor['warnstate'] == '2',
+                  value3: posMonitor['warnstate'] == '3',
+                }"
+                >{{
+                  posMonitor['warnstate'] == '0'
+                    ? '无报警'
+                    : posMonitor['warnstate'] == '1'
+                    ? '定温'
+                    : posMonitor['warnstate'] == '2'
+                    ? '差温'
+                    : posMonitor['warnstate'] == '3'
+                    ? '预报警'
+                    : '--'
+                }}</div
+              >
             </div>
           </div>
           <div class="top-item">
@@ -72,391 +101,386 @@
             </div>
             <div class="item-container">
               <div class="title">报警位置</div>
-              <div class="value">{{ posMonitor.warnposition !== undefined && posMonitor.warnposition !== null ?
-                posMonitor.warnposition : '-'
-                }} <span>m</span></div>
+              <div class="value"
+                >{{ posMonitor.warnposition !== undefined && posMonitor.warnposition !== null ? posMonitor.warnposition : '-' }} <span>m</span></div
+              >
             </div>
           </div>
-
         </div>
         <div style="width: 100%; display: flex">
           <div class="right-bottom">
             <span class="base-title">历史数据监测</span>
             <div class="echarts-box">
-              <BarAndLine class="echarts-line" :xAxisPropType="xAxisPropType" :dataSource="historyList" height="100%"
-                width="100%" :chartsColumns="chartsColumns" :option="echatsOption" />
+              <BarAndLine
+                class="echarts-line"
+                :xAxisPropType="xAxisPropType"
+                :dataSource="historyList"
+                height="100%"
+                width="100%"
+                :chartsColumns="chartsColumns"
+                :option="echatsOption"
+              />
             </div>
           </div>
-
         </div>
       </div>
     </div>
   </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 { SvgIcon } from '/@/components/Icon';
-import dayjs from 'dayjs';
-import { chartsColumnListGx } from '../device.data';
-
-
-export default defineComponent({
-  components: { BasicModal, BarAndLine, SvgIcon, },
-  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 posMonitor = shallowRef<any>({});
-
-    const echatsOption = {
-      grid: {
-        top: '14%',
-        left: '3',
-        right: '20',
-        bottom: '3%',
-        containLabel: true,
-      },
-      toolbox: {
-        feature: null,
-      },
-    };
-
-    const chartsColumns = chartsColumnListGx;
-    const xAxisPropType = ref('time');
-    const [register, { setModalProps, closeModal }] = useModalInner();
-
-
-
-    // 选择监测
-    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();
-    }
+  import { defineComponent, ref, watch, shallowRef, onMounted } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import BarAndLine from '/@/components/chart/BarAndLine.vue';
+  import { SvgIcon } from '/@/components/Icon';
+  import dayjs from 'dayjs';
+  import { chartsColumnListGx } from '../device.data';
+
+  export default defineComponent({
+    components: { BasicModal, BarAndLine, SvgIcon },
+    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 posMonitor = shallowRef<any>({});
+
+      const echatsOption = {
+        grid: {
+          top: '14%',
+          left: '3',
+          right: '20',
+          bottom: '3%',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: null,
+        },
+      };
+
+      const chartsColumns = chartsColumnListGx;
+      const xAxisPropType = ref('time');
+      const [register, { setModalProps, closeModal }] = useModalInner();
+
+      // 选择监测
+      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();
+      }
 
-    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);
-            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;
-        });
-      },
-      { immediate: true }
-    );
-    onMounted(() => {
-
-    });
-    return {
-      register,
-      model: modelRef,
-      currentTime,
-      selectDevice,
-      handleOk,
-      handleCancel,
-      deviceList,
-      historyList,
-      activeDeviceID,
-      posMonitor,
-      echatsOption,
-      chartsColumns,
-      xAxisPropType,
-    };
-  },
-});
+          // 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;
+          });
+        },
+        { immediate: true }
+      );
+      onMounted(() => {});
+      return {
+        register,
+        model: modelRef,
+        currentTime,
+        selectDevice,
+        handleOk,
+        handleCancel,
+        deviceList,
+        historyList,
+        activeDeviceID,
+        posMonitor,
+        echatsOption,
+        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;
 
-    .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: 303px;
-        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: 303px;
+          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;
+          }
 
-        .value1 {
-          font-size: 18px;
-          color: rgb(145, 230, 9) !important;
-        }
+          .value1 {
+            font-size: 18px;
+            color: rgb(145, 230, 9) !important;
+          }
 
-        .value2 {
-          font-size: 18px;
-          // color: rgb(0, 242, 255) !important;
-          color: #ffff35 !important;
-        }
+          .value2 {
+            font-size: 18px;
+            // color: rgb(0, 242, 255) !important;
+            color: #ffff35 !important;
+          }
 
-        .value3 {
-          font-size: 18px;
-          // color: #ffff35 !important;
-          color: #ff0000 !important;
-        }
+          .value3 {
+            font-size: 18px;
+            // color: #ffff35 !important;
+            color: #ff0000 !important;
+          }
 
-        .value4 {
-          font-size: 18px;
-          color: #ffbe69 !important;
-        }
+          .value4 {
+            font-size: 18px;
+            color: #ffbe69 !important;
+          }
 
-        .value5 {
-          font-size: 18px;
-          color: #ff6f00 !important;
-        }
+          .value5 {
+            font-size: 18px;
+            color: #ff6f00 !important;
+          }
 
-        .value6 {
-          font-size: 18px;
-          color: #ff0000 !important;
+          .value6 {
+            font-size: 18px;
+            color: #ff0000 !important;
+          }
         }
       }
-    }
 
-    .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 {
-      width: 100%;
-      margin-top: 10px;
 
-      .echarts-box {
+      .right-bottom {
         width: 100%;
-        height: 320px;
-        position: relative;
-        // display: flex;
-        // justify-content: space-between;
+        margin-top: 10px;
 
-        .echarts-line {
-          width: calc(100% + 80px);
-          position: absolute;
+        .echarts-box {
+          width: 100%;
+          height: 320px;
+          position: relative;
+          // display: flex;
+          // justify-content: space-between;
+
+          .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-wrapper) {
-  padding-top: 20px;
-  box-sizing: border-box;
-}
+  :deep(.zxm-table-wrapper) {
+    padding-top: 20px;
+    box-sizing: border-box;
+  }
 
-:deep(.zxm-table-cell) {
-  border-right: none !important;
-}
-</style>
+  :deep(.zxm-table-cell) {
+    border-right: none !important;
+  }
+</style>

src/views/vent/monitorManager/deviceMonitor/components/device/modal/fiber.modal.sjh.vue

@@ -1,10 +1,13 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="register" :title="`光纤测温详情${currentTime}`" width="1200px" @ok="handleOk"
-    @cancel="handleCancel">
+  <BasicModal v-bind="$attrs" @register="register" :title="`光纤测温详情${currentTime}`" width="1200px" @ok="handleOk" @cancel="handleCancel">
     <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>
@@ -63,8 +66,7 @@
         <div class="right-bottom">
           <span class="base-title">测点监测曲线</span>
           <div class="echarts-box">
-            <BarAndLine xAxisPropType="tempmax" :dataSource="posList1" height="100%" :chartsColumns="chartsColumns"
-              :option="echatsOption" />
+            <BarAndLine xAxisPropType="tempmax" :dataSource="posList1" height="100%" :chartsColumns="chartsColumns" :option="echatsOption" />
           </div>
         </div>
       </div>
@@ -72,396 +74,396 @@
   </BasicModal>
 </template>
 <script lang="ts">
-import { defineComponent, ref, watch, shallowRef, reactive } 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 { formatNum } from '/@/utils/ventutil';
-
-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<any>('');
-    const deviceList = ref<any[]>([]);
-    const posList = reactive<any[]>([]);
-    const posList1 = reactive<any[]>([]);
-    const posMonitor = shallowRef({});
-
-    const echatsOption = {
-      grid: {
-        top: '20%',
-        left: '2px',
-        right: '10px',
-        bottom: '3%',
-        containLabel: true,
-      },
-      toolbox: {
-        feature: {},
-      },
-    };
-
-    const chartsColumns = [
-      {
-        legend: '测点报警温度',
-        seriesName: '(℃)',
-        ymax: 100,
-        yname: '℃',
-        linetype: 'line',
-        yaxispos: 'left',
-        color: '#FDB146',
-        sort: 1,
-        xRotate: 0,
-        dataIndex: 'value',
-      },
-    ];
-    const columns = [
-      {
-        title: '位置',
-        dataIndex: 'maxposition',
-        align: 'center',
-        width: 120,
-      },
-      {
-        title: '最高温度(℃)',
-        dataIndex: 'tempmax',
-        align: 'center',
-        width: 100,
-      },
-      {
-        title: '起点',
-        dataIndex: 'fiberstart',
-        align: 'center',
-      },
-      {
-        title: '终点',
-        dataIndex: 'fiberend',
-        align: 'center',
-      },
-      {
-        title: '报警状态',
-        dataIndex: 'alarmflag',
-        align: 'center',
-      },
-    ];
-
-    // const warningConfig = reactive({
-    //     header: ['测点', '温度', '预警信息'],
-    //     data: [
-    //         ['测点6', '318℃', '严重报警'],
-    //         ['测点43', '142℃', '一般预警'],
-    //         ['测点23', '167℃', '一般预警'],
-    //         ['测点6', '198℃', '超高预警'],
-    //         ['测点65', '197℃', '超高预警'],
-    //         ['测点78', '154℃', '一般预警'],
-    //         ['测点61', '104℃', '一般预警'],
-    //         ['测点87', '150℃', '一般信息'],
-    //     ],
-    //     index: false,
-    //     columnWidth: [150],
-    //     headerHeight: 38,
-    //     headerBGC: '#3d9dd45d',
-    //     oddRowBGC: '#009acd10',
-    //     evenRowBGC: '#009acd05',
-    //     align: ['center', 'center', 'center'],
-    // });
-
-    const [register, { setModalProps, closeModal }] = useModalInner();
-
-    function handleVisibleChange(visible) {
-      if (visible) {
+  import { defineComponent, ref, watch, shallowRef, reactive } 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 { formatNum } from '/@/utils/ventutil';
+
+  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<any>('');
+      const deviceList = ref<any[]>([]);
+      const posList = reactive<any[]>([]);
+      const posList1 = reactive<any[]>([]);
+      const posMonitor = shallowRef({});
+
+      const echatsOption = {
+        grid: {
+          top: '20%',
+          left: '2px',
+          right: '10px',
+          bottom: '3%',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {},
+        },
+      };
+
+      const chartsColumns = [
+        {
+          legend: '测点报警温度',
+          seriesName: '(℃)',
+          ymax: 100,
+          yname: '℃',
+          linetype: 'line',
+          yaxispos: 'left',
+          color: '#FDB146',
+          sort: 1,
+          xRotate: 0,
+          dataIndex: 'value',
+        },
+      ];
+      const columns = [
+        {
+          title: '位置',
+          dataIndex: 'maxposition',
+          align: 'center',
+          width: 120,
+        },
+        {
+          title: '最高温度(℃)',
+          dataIndex: 'tempmax',
+          align: 'center',
+          width: 100,
+        },
+        {
+          title: '起点',
+          dataIndex: 'fiberstart',
+          align: 'center',
+        },
+        {
+          title: '终点',
+          dataIndex: 'fiberend',
+          align: 'center',
+        },
+        {
+          title: '报警状态',
+          dataIndex: 'alarmflag',
+          align: 'center',
+        },
+      ];
+
+      // const warningConfig = reactive({
+      //     header: ['测点', '温度', '预警信息'],
+      //     data: [
+      //         ['测点6', '318℃', '严重报警'],
+      //         ['测点43', '142℃', '一般预警'],
+      //         ['测点23', '167℃', '一般预警'],
+      //         ['测点6', '198℃', '超高预警'],
+      //         ['测点65', '197℃', '超高预警'],
+      //         ['测点78', '154℃', '一般预警'],
+      //         ['测点61', '104℃', '一般预警'],
+      //         ['测点87', '150℃', '一般信息'],
+      //     ],
+      //     index: false,
+      //     columnWidth: [150],
+      //     headerHeight: 38,
+      //     headerBGC: '#3d9dd45d',
+      //     oddRowBGC: '#009acd10',
+      //     evenRowBGC: '#009acd05',
+      //     align: ['center', 'center', 'center'],
+      // });
+
+      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]) => {
-      console.log(newDataSource, 'newDataSource--------------');
-      deviceList.value = newDataSource as any[];
-      if (newActiveID != oldActiveID) {
-        activeDeviceID.value = newActiveID as string;
+      function handleCancel(e) {
+        e.preventDefault();
+        closeModal();
       }
-      // activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
-      posList.length = 0;
-      posList1.length = 0;
-      newDataSource?.forEach((item: any, index) => {
-        if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-          posMonitor.value = item.readData;
-          posList.push({
-            maxposition: item.readData['maxposition'],
-            tempmax: item.readData['tempmax'],
-            fiberstart: item.readData['fiberstart'],
-            fiberend: item.readData['fiberend'],
-            alarmflag: item.readData['alarmflag'] == '0' ? '正常' : '报警',
-          });
-          let echartList = item.readData.TempStr ? item.readData.TempStr.split(',') : [];
-          echartList.forEach((el, index) => {
-            posList1.push({ tempmax: index + 1, value: el });
-          });
+
+      watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
+        console.log(newDataSource, 'newDataSource--------------');
+        deviceList.value = newDataSource as any[];
+        if (newActiveID != oldActiveID) {
+          activeDeviceID.value = newActiveID as string;
         }
+        // activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
+        posList.length = 0;
+        posList1.length = 0;
+        newDataSource?.forEach((item: any, index) => {
+          if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
+            posMonitor.value = item.readData;
+            posList.push({
+              maxposition: item.readData['maxposition'],
+              tempmax: item.readData['tempmax'],
+              fiberstart: item.readData['fiberstart'],
+              fiberend: item.readData['fiberend'],
+              alarmflag: item.readData['alarmflag'] == '0' ? '正常' : '报警',
+            });
+            let echartList = item.readData.TempStr ? item.readData.TempStr.split(',') : [];
+            echartList.forEach((el, index) => {
+              posList1.push({ tempmax: index + 1, value: el });
+            });
+          }
+        });
       });
-    });
-
-    return {
-      register,
-      model: modelRef,
-      currentTime,
-      handleVisibleChange,
-      selectDevice,
-      handleOk,
-      handleCancel,
-      deviceList,
-      activeDeviceID,
-      posMonitor,
-      echatsOption,
-      posList,
-      posList1,
-      chartsColumns,
-      columns,
-      formatNum,
-      // warningConfig,
-    };
-  },
-});
+
+      return {
+        register,
+        model: modelRef,
+        currentTime,
+        handleVisibleChange,
+        selectDevice,
+        handleOk,
+        handleCancel,
+        deviceList,
+        activeDeviceID,
+        posMonitor,
+        echatsOption,
+        posList,
+        posList1,
+        chartsColumns,
+        columns,
+        formatNum,
+        // warningConfig,
+      };
+    },
+  });
 </script>
 <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;
 
-    .right-top {
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-      margin-bottom: 10px;
+      .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;
+        }
+      }
 
-      .top-item {
-        width: 200px;
-        height: 80px;
+      .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: 16px;
-
-        .icon {
-          margin-right: 10px;
-          margin-top: 5px;
-          color: #fdb146;
-        }
+        justify-content: space-between;
+        margin-bottom: 10px;
 
-        .item-container {
-          width: 100px;
+        .top-item {
+          width: 200px;
+          height: 80px;
           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: 16px;
+
+          .icon {
+            margin-right: 10px;
+            margin-top: 5px;
+            color: #fdb146;
           }
 
-          .title {
-            font-size: 18px;
-          }
+          .item-container {
+            width: 100px;
+            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;
 
-          .icon-style {
-            color: #fdb146;
+            .icon-style {
+              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: 100%;
-        height: 250px;
+        .table-box {
+          position: relative;
+          width: 100%;
+          height: 250px;
 
-        :deep(.zxm-table-wrapper) {
-          height: 220px !important;
-          background: #ffffff05 !important;
-          border-bottom: 1px solid #91e9fe80 !important;
+          :deep(.zxm-table-wrapper) {
+            height: 220px !important;
+            background: #ffffff05 !important;
+            border-bottom: 1px solid #91e9fe80 !important;
+          }
         }
-      }
 
-      // .warning-box {
-      //     width: calc(100% - 520px);
-
-      //     .warning-container {
-      //         width: 100%;
-      //         height: convert;
-      //         background: #009acd00;
-
-      //         :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;
-      //             }
-      //         }
-      //     }
-      // }
-    }
+        // .warning-box {
+        //     width: calc(100% - 520px);
+
+        //     .warning-container {
+        //         width: 100%;
+        //         height: convert;
+        //         background: #009acd00;
+
+        //         :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;
+        //             }
+        //         }
+        //     }
+        // }
+      }
 
-    .right-bottom {
-      margin-top: 20px;
+      .right-bottom {
+        margin-top: 20px;
 
-      .echarts-box {
-        width: 100%;
-        height: 230px;
+        .echarts-box {
+          width: 100%;
+          height: 230px;
+        }
       }
     }
   }
-}
 
-: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/deviceMonitor/components/device/modal/fiber.modal.sw.vue

@@ -1,185 +1,187 @@
 <template>
-    <BasicModal v-bind="$attrs" @register="register" :title="`光纤测温详情    ${currentTime}`" width="1200px" @ok="handleOk"
-        @cancel="handleCancel">
-        <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">
-                    <span class="" @click="selectDevice(device.deviceID)">{{ device.strinstallpos }}</span>
-                </div>
+  <BasicModal v-bind="$attrs" @register="register" :title="`光纤测温详情    ${currentTime}`" width="1200px" @ok="handleOk" @cancel="handleCancel">
+    <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"
+        >
+          <span class="" @click="selectDevice(device.deviceID)">{{ device.strinstallpos }}</span>
+        </div>
+      </div>
+      <div class="modal-right">
+        <div class="right-top">
+          <div class="top-item">
+            <div class="icon">
+              <SvgIcon class="icon-style max-temperature" size="38" name="max-temperature" />
+            </div>
+            <div class="item-container">
+              <div class="title">最高温度</div>
+              <div class="value">{{ posMonitor.fmax || '--' }} <span>℃</span> </div>
+            </div>
+          </div>
+          <div class="top-item">
+            <div class="icon">
+              <SvgIcon class="icon-style min-temperature" size="38" name="min-temperature" />
+            </div>
+            <div class="item-container">
+              <div class="title">最低温度</div>
+              <div class="value">{{ posMonitor.fmin || '--' }} <span>℃</span></div>
             </div>
-            <div class="modal-right">
-                <div class="right-top">
-                    <div class="top-item">
-                        <div class="icon">
-                            <SvgIcon class="icon-style max-temperature" size="38" name="max-temperature" />
-                        </div>
-                        <div class="item-container">
-                            <div class="title">最高温度</div>
-                            <div class="value">{{ posMonitor.fmax || '--' }} <span>℃</span> </div>
-                        </div>
-                    </div>
-                    <div class="top-item">
-                        <div class="icon">
-                            <SvgIcon class="icon-style min-temperature" size="38" name="min-temperature" />
-                        </div>
-                        <div class="item-container">
-                            <div class="title">最低温度</div>
-                            <div class="value">{{ posMonitor.fmin || '--' }} <span>℃</span></div>
-                        </div>
-                    </div>
-                    <div class="top-item">
-                        <div class="icon">
-                            <SvgIcon class="icon-style aveg-temperature" size="38" name="aveg-temperature" />
-                        </div>
-                        <div class="item-container">
-                            <div class="title">平均温度</div>
-                            <div class="value">{{ posMonitor.favg || '--' }} <span>℃</span></div>
-                        </div>
-                    </div>
-                    <div class="top-item warning-box">
-                        <div class="icon">
-                            <SvgIcon class="icon-style" size="38" name="risk-level" />
-                        </div>
-                        <div class="item-container">
-                            <div class="title">风险等级</div>
-                            <div class="warning-value">低风险</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="right-bottom">
-                    <span class="base-title">测点监测曲线</span>
-                    <div class="echarts-box">
-                        <BarAndLine xAxisPropType="pos" :dataSource="posList" height="100%"
-                            :chartsColumns="chartsColumns" :option="echatsOption" />
-                    </div>
-                </div>
+          </div>
+          <div class="top-item">
+            <div class="icon">
+              <SvgIcon class="icon-style aveg-temperature" size="38" name="aveg-temperature" />
             </div>
+            <div class="item-container">
+              <div class="title">平均温度</div>
+              <div class="value">{{ posMonitor.favg || '--' }} <span>℃</span></div>
+            </div>
+          </div>
+          <div class="top-item warning-box">
+            <div class="icon">
+              <SvgIcon class="icon-style" size="38" name="risk-level" />
+            </div>
+            <div class="item-container">
+              <div class="title">风险等级</div>
+              <div class="warning-value">低风险</div>
+            </div>
+          </div>
+        </div>
+        <div class="right-bottom">
+          <span class="base-title">测点监测曲线</span>
+          <div class="echarts-box">
+            <BarAndLine xAxisPropType="pos" :dataSource="posList" height="100%" :chartsColumns="chartsColumns" :option="echatsOption" />
+          </div>
         </div>
-    </BasicModal>
+      </div>
+    </div>
+  </BasicModal>
 </template>
 <script lang="ts">
-import { defineComponent, ref, watch, shallowRef, reactive } 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';
-
-export default defineComponent({
+  import { defineComponent, ref, watch, shallowRef, reactive } 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';
+
+  export default defineComponent({
     components: { BasicModal, BarAndLine, SvgIcon, DvScrollBoard, DvDecoration7 },
     props: {
-        dataSource: { type: Array },
-        activeID: { type: String },
+      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<any>('');
-        const deviceList = ref<any[]>([]);
-        // const posList = reactive<any[]>([]);
-        const posList = ref<any[]>([]);
-        const posMonitor = shallowRef({});
-
-        const echatsOption = {
-            grid: {
-                top: '10%',
-                left: '2px',
-                right: '10px',
-                bottom: '3%',
-                containLabel: true,
-            },
-            toolbox: {
-                feature: {},
-            },
-        };
-
-        const chartsColumns = [
-            {
-                legend: '温度',
-                seriesName: '(℃)',
-                ymax: 100,
-                yname: '℃',
-                linetype: 'line',
-                yaxispos: 'left',
-                color: '#FDB146',
-                sort: 1,
-                xRotate: 0,
-                dataIndex: 'value',
-            },
-        ];
-
-        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 });
-            }, 300);
+      const currentTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
+      const modelRef = ref({});
+      const loading = ref(true);
+      const activeDeviceID = ref<any>('');
+      const deviceList = ref<any[]>([]);
+      // const posList = reactive<any[]>([]);
+      const posList = ref<any[]>([]);
+      const posMonitor = shallowRef({});
+
+      const echatsOption = {
+        grid: {
+          top: '10%',
+          left: '2px',
+          right: '10px',
+          bottom: '3%',
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {},
+        },
+      };
+
+      const chartsColumns = [
+        {
+          legend: '温度',
+          seriesName: '(℃)',
+          ymax: 100,
+          yname: '℃',
+          linetype: 'line',
+          yaxispos: 'left',
+          color: '#FDB146',
+          sort: 1,
+          xRotate: 0,
+          dataIndex: 'value',
+        },
+      ];
+
+      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 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);
+      }
+
+      function handleOk(e) {
+        e.preventDefault();
+        closeModal();
+      }
+
+      function handleCancel(e) {
+        e.preventDefault();
+        closeModal();
+      }
+
+      watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
+        console.log(newDataSource, 'newDataSource--------------');
+        deviceList.value = newDataSource as any[];
+        if (newActiveID != oldActiveID) {
+          activeDeviceID.value = newActiveID as string;
         }
-
-        function handleCancel(e) {
-            e.preventDefault();
-            closeModal();
-        }
-
-        watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
-            console.log(newDataSource, 'newDataSource--------------');
-            deviceList.value = newDataSource as any[];
-            if (newActiveID != oldActiveID) {
-                activeDeviceID.value = newActiveID as string;
-            }
-            // activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
-            newDataSource?.forEach((item: any, index) => {
-                if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-                    posMonitor.value = item.readData;
-                    posList.value = JSON.parse(item.readData.fibreTemperature)
-                }
-            });
+        // activeDeviceID.value = activeDeviceID.value ? activeDeviceID.value : newActiveID;
+        newDataSource?.forEach((item: any, index) => {
+          if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
+            posMonitor.value = item.readData;
+            posList.value = JSON.parse(item.readData.fibreTemperature);
+          }
         });
-
-        return {
-            register,
-            model: modelRef,
-            currentTime,
-            handleVisibleChange,
-            selectDevice,
-            handleOk,
-            handleCancel,
-            deviceList,
-            activeDeviceID,
-            posMonitor,
-            echatsOption,
-            chartsColumns,
-            posList
-        };
+      });
+
+      return {
+        register,
+        model: modelRef,
+        currentTime,
+        handleVisibleChange,
+        selectDevice,
+        handleOk,
+        handleCancel,
+        deviceList,
+        activeDeviceID,
+        posMonitor,
+        echatsOption,
+        chartsColumns,
+        posList,
+      };
     },
-});
+  });
 </script>
 <style lang="less" scoped>
-.fiber-modal {
+  .fiber-modal {
     width: 100%;
     height: 650px;
     display: flex;
@@ -187,201 +189,201 @@ export default defineComponent({
     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;
+      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;
+
+        span:hover {
+          color: #89ffff;
         }
 
-        .link-item {
-            position: relative;
-            cursor: pointer;
-            line-height: 30px;
-            padding-left: 30px;
-
-            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;
-            }
+      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 {
+      }
+
+      .right-top {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        margin-bottom: 10px;
+
+        .top-item {
+          width: 200px;
+          height: 80px;
+          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: 16px;
+
+          .icon {
+            margin-right: 10px;
+            margin-top: 5px;
+            color: #fdb146;
+          }
+
+          .item-container {
+            width: 100px;
             display: flex;
-            flex-direction: row;
-            justify-content: space-between;
-            margin-bottom: 10px;
-
-            .top-item {
-                width: 200px;
-                height: 80px;
-                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: 16px;
-
-                .icon {
-                    margin-right: 10px;
-                    margin-top: 5px;
-                    color: #fdb146;
-                }
-
-                .item-container {
-                    width: 100px;
-                    display: flex;
-                    flex-direction: column;
-                    justify-content: center;
-
-                    div {
-                        text-align: center;
-                    }
-
-                    .title {
-                        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;
-                        }
-                    }
-                }
-            }
-
-            .warning-box {
-                padding-top: 0px;
+            flex-direction: column;
+            justify-content: center;
 
-                .icon {
-                    margin-top: 20px;
+            div {
+              text-align: center;
+            }
 
-                    .icon-style {
-                        color: #fdb146;
-                    }
-                }
+            .title {
+              font-size: 18px;
+            }
 
-                .warning-value {
-                    font-size: 18px;
-                    color: #61ddb1;
-                }
+            .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;
+              }
             }
+          }
         }
 
-        // .right-center {
-        //   margin-top: 20px;
-        //   display: flex;
-        //   flex-direction: row;
-        //   justify-content: space-between;
-
-        //   .table-box {
-        //     position: relative;
-        //     width: 500px;
-        //     height: 250px;
-        //     :deep(.zxm-table-wrapper) {
-        //       height: 220px !important;
-        //       background: #ffffff05 !important;
-        //       border-bottom: 1px solid #91e9fe80 !important;
-        //     }
-        //   }
-
-        //   .warning-box {
-        //     width: calc(100% - 520px);
-
-        //     .warning-container {
-        //       width: 100%;
-        //       height: convert;
-        //       background: #009acd00;
-
-        //       :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;
-        //         }
-        //       }
-        //     }
-        //   }
-        // }
-
-        .right-bottom {
+        .warning-box {
+          padding-top: 0px;
+
+          .icon {
             margin-top: 20px;
-            height: calc(100% - 100px);
 
-            .echarts-box {
-                width: 100%;
-                height: calc(100% - 32px);
+            .icon-style {
+              color: #fdb146;
             }
+          }
+
+          .warning-value {
+            font-size: 18px;
+            color: #61ddb1;
+          }
+        }
+      }
+
+      // .right-center {
+      //   margin-top: 20px;
+      //   display: flex;
+      //   flex-direction: row;
+      //   justify-content: space-between;
+
+      //   .table-box {
+      //     position: relative;
+      //     width: 500px;
+      //     height: 250px;
+      //     :deep(.zxm-table-wrapper) {
+      //       height: 220px !important;
+      //       background: #ffffff05 !important;
+      //       border-bottom: 1px solid #91e9fe80 !important;
+      //     }
+      //   }
+
+      //   .warning-box {
+      //     width: calc(100% - 520px);
+
+      //     .warning-container {
+      //       width: 100%;
+      //       height: convert;
+      //       background: #009acd00;
+
+      //       :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;
+      //         }
+      //       }
+      //     }
+      //   }
+      // }
+
+      .right-bottom {
+        margin-top: 20px;
+        height: calc(100% - 100px);
+
+        .echarts-box {
+          width: 100%;
+          height: calc(100% - 32px);
         }
+      }
     }
-}
+  }
 
-:deep(.zxm-table-body) {
+  :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) {
+  :deep(.zxm-table-cell) {
     border-right: none !important;
-}
-</style>
+  }
+</style>

src/views/vent/monitorManager/gasPumpMonitor/gasPump.dataCc2_2.ts

@@ -48,9 +48,6 @@ export const leftMonitor = [
       },
     ],
   },
-];
-
-export const rightMonitor = [
   {
     type: 'list',
     title: '水泵',
@@ -80,6 +77,9 @@ export const rightMonitor = [
       },
     ],
   },
+];
+
+export const rightMonitor = [
   {
     type: 'list',
     title: '软化水监测',

src/views/vent/monitorManager/mainFanMonitor/main.data.ts

@@ -813,7 +813,7 @@ export const assistanceData = {
 export const setOption = (deviceType?) => {
   let yMax = 4500;
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtsgtmk';
+  // const sysOrgCode = 'sdmtjtcctrk';
   if (sysOrgCode == 'sdmtjtdltmk') {
     // 这里判断白家渠还是五当沟
     if (deviceType == 'fanmain_bjq') {
@@ -839,6 +839,8 @@ export const setOption = (deviceType?) => {
     yMax = 3000;
   } else if (sysOrgCode == 'sdmtjtdltmkhjtj') {
     yMax = 3000;
+  } else if (sysOrgCode == 'sdmtjtcctrk') {
+    yMax = 600;
   } else {
     yMax = 4500;
   }
@@ -1150,13 +1152,13 @@ export const initData1 = () => {
 // 大柳塔武当沟
 export const initData = (deviceType?) => {
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtsgtmk';
+  // const sysOrgCode = 'sdmtjtcctrk';
   if (sysOrgCode == 'sdmtjtdltmk') {
     return initDataDlt(deviceType);
   } else if (sysOrgCode == 'sdmtjtswmk') {
     return initDataSw(deviceType);
   } else if (sysOrgCode == 'sdmtjtbltmk') {
-    return initDataBlt('fanmain_bfj');
+    return initDataBlt();
   } else if (sysOrgCode == 'sdmtjtbdmk') {
     return initDataBd(deviceType);
   } else if (sysOrgCode == 'sdmtjtjjmk') {
@@ -1165,11 +1167,47 @@ export const initData = (deviceType?) => {
     return initDataHjt();
   } else if (sysOrgCode == 'sdmtjtsgtmk') {
     return initDataSgt();
+  } else if (sysOrgCode == 'sdmtjtyjlmk') {
+    return initDataJj();
+  } else if (sysOrgCode == 'sdmtjtcctrk') {
+    return initDataCctr();
   } else {
     return initData1();
   }
 };
 // 石圪台
+const initDataCctr = () => {
+  const data: any[] = [];
+  data.push({
+    angle: 0,
+    Hz: 0,
+    a: -0.0221,
+    b: -1.2494,
+    c: 552.28,
+    min: 52,
+    max: 125,
+  });
+  data.push({
+    angle: 3,
+    Hz: 3,
+    a: -0.0232,
+    b: -0.8204,
+    c: 603.39,
+    min: 50,
+    max: 139,
+  });
+  data.push({
+    angle: 6,
+    Hz: 6,
+    a: -0.0417,
+    b: 3.1004,
+    c: 498.9,
+    min: 45,
+    max: 150,
+  });
+  return data;
+};
+// 石圪台
 const initDataSgt = () => {
   const data: any[] = [];
   data.push({

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

@@ -69,7 +69,6 @@
     } else if (res['msgTxt'] && res['msgTxt'][0] && res['msgTxt'][0]['datalist']) {
       result = res['msgTxt'][0]['datalist'];
     }
-
     if (result && result.length > 0) {
       deviceOptions.value = [];
       deviceOptions.value = result.map((item, index) => {
@@ -216,6 +215,24 @@
               span: 4,
             },
           },
+          {
+            label: '是否解决',
+            field: 'isok',
+            component: 'Select',
+            componentProps: {
+              options: [
+                {
+                  label: '未解决',
+                  value: '0',
+                },
+                {
+                  label: '已解决',
+                  value: '1',
+                },
+              ],
+            },
+            colProps: { span: 4 },
+          },
         ],
       },
       fetchSetting: {

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

@@ -136,21 +136,21 @@
         <div class="tab-item">
           <AlarmHistoryTable
             ref="alarmHistoryTable"
-            v-if="globalConfig.History_Type == 'remote' && activeKey == '3'"
+            v-if="activeKey == '3'"
             columns-type="alarm"
             :list="safetyList"
             :device-type="deviceType"
             :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, pageSize: 10000 })"
             designScope="alarm-history"
           />
-          <AlarmHistoryCommentTable
+          <!-- <AlarmHistoryCommentTable
             ref="alarmHistoryTable"
             v-else-if="activeKey == '3'"
             columns-type="alarm"
             :device-type="deviceType"
             :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, pageSize: 10000 })"
             designScope="alarm-history"
-          />
+          /> -->
         </div>
       </a-tab-pane>
       <a-tab-pane key="4" tab="操作历史" v-if="deviceType !== 'safetymonitor' && deviceType !== 'wasichoufang'">
@@ -190,7 +190,7 @@
 <script setup lang="ts">
   import { ref, onMounted, onUnmounted, shallowRef, defineProps, watch, inject, unref } from 'vue';
   import { list, getDeviceList, safetyList, getExportUrl, subStationList, initSubStation } from './safety.api';
-  import AlarmHistoryCommentTable from '../comment/AlarmHistoryTable.vue';
+  // import AlarmHistoryCommentTable from '../comment/AlarmHistoryTable.vue';
   import AlarmHistoryTable from './AlarmHistoryTable.vue';
   import HistoryTable from './HistoryTable.vue';
   import HandlerHistoryTable from '../comment/HandlerHistoryTable.vue';

src/views/vent/monitorManager/warningMonitor/alarm.data.ts

@@ -58,7 +58,7 @@ export const manageAutoColumns1: BasicColumn[] = [
     width: 100,
     align: 'center',
   },
-   {
+  {
     title: '报警描述',
     dataIndex: 'autoContent',
     width: 210,

src/views/vent/monitorManager/warningMonitor/index-mine.vue

@@ -26,11 +26,33 @@
       <template #form-onExportXls>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()"> 导出</a-button>
       </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.dict">
+          <!-- 除了 101（蓝色预警）其他都是红色字体 -->
+          <span v-if="column.dataIndex === 'nwartype'" :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+            {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
+          </span>
+          <span v-else>
+            {{ render.renderDictText(record[column.dataIndex], column.dict) || '-' }}
+          </span>
+        </template>
+      </template>
     </BasicTable>
     <BasicTable v-if="activeKey == 'manageAuto'" ref="alarmHistory" @register="registerTable" :scroll="{ x: 0, y: 350 }">
       <template #form-onExportXls>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()"> 导出</a-button>
       </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.dict">
+          <!-- 除了 101（蓝色预警）其他都是红色字体 -->
+          <span v-if="column.dataIndex === 'nwartype'" :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+            {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
+          </span>
+          <span v-else>
+            {{ render.renderDictText(record[column.dataIndex], column.dict) || '-' }}
+          </span>
+        </template>
+      </template>
     </BasicTable>
   </div>
 </template>
@@ -46,6 +68,7 @@
   import { getAlarmLogList, getManageAutoLogList, getWarnCountInfo } from './warning.api';
   import { useRoute } from 'vue-router';
   import customHeader from '/@/components/vent/customHeader.vue';
+  import { render } from '/@/utils/common/renderUtils';
   const props = defineProps({
     formConfig: {
       type: Object as PropType<FormProps> | undefined,

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

@@ -26,11 +26,33 @@
       <template #form-onExportXls>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()"> 导出</a-button>
       </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.dict">
+          <!-- 除了 101（蓝色预警）其他都是红色字体 -->
+          <span v-if="column.dataIndex === 'nwartype'" :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+            {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
+          </span>
+          <span v-else>
+            {{ render.renderDictText(record[column.dataIndex], column.dict) || '-' }}
+          </span>
+        </template>
+      </template>
     </BasicTable>
     <BasicTable v-if="activeKey == 'manageAuto'" ref="alarmHistory" @register="registerTable" :scroll="{ x: 0, y: 350 }">
       <template #form-onExportXls>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()"> 导出</a-button>
       </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.dict">
+          <!-- 除了 101（蓝色预警）其他都是红色字体 -->
+          <span v-if="column.dataIndex === 'nwartype'" :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+            {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
+          </span>
+          <span v-else>
+            {{ render.renderDictText(record[column.dataIndex], column.dict) || '-' }}
+          </span>
+        </template>
+      </template>
     </BasicTable>
   </div>
 </template>
@@ -46,6 +68,7 @@
   import { list, getEachMineWarnCountInfo } from './warning.api';
   import { useRoute } from 'vue-router';
   import customHeader from '/@/components/vent/customHeader.vue';
+  import { render } from '/@/utils/common/renderUtils';
   const props = defineProps({
     formConfig: {
       type: Object as PropType<FormProps> | undefined,

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

@@ -18,7 +18,7 @@
   <div class="scene-box">
     <div class="top-box">
       <div class="top-center" style="display: flex">
-        <div class="row" v-if="Number(selectData.nwindownum) > 1">
+        <div class="row" v-if="Number(selectData.nwindow) > 1">
           <div v-if="hasPermission('window:AreaControl')" class="button-box" @click="setArea(1)">设定前窗面积</div>
           <div v-if="hasPermission('window:AreaControl')" class="button-box" @click="setArea(2)">设定后窗面积</div>
           <div v-if="hasPermission('window:showAngle')" class="button-box" @click="setAngle(1)">设定前窗角度</div>
@@ -39,7 +39,7 @@
           <div class="button-box" @click="setControl('frontSetValue3', '后窗1面积设置')">后窗1面积</div>
           <div class="button-box" @click="setControl('frontSetValue4', '后窗2面积设置')">后窗2面积</div>
         </div>
-        <div class="row" v-if="Number(selectData.nwindownum) == 1">
+        <div class="row" v-if="Number(selectData.nwindow) == 1">
           <div v-if="hasPermission('window:AreaControl')" class="button-box" @click="setArea(1)">设定风窗面积</div>
           <div v-if="hasPermission('window:showAngle')" class="button-box" @click="setAngle(1)">设定风窗角度</div>
         </div>