فهرست منبع

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

lxh 2 ماه پیش
والد
کامیت
5f8d877bee

BIN
public/model/glft/fire/tunFace_2025-01-09.glb → public/model/glft/fire/tunFace_2025-01-13.glb


+ 0 - 0
public/model/glft/workFace/workFaceDust_2025-01-06.glb


+ 0 - 0
public/model/glft/workFace/workFaceGas_2025-01-06.glb


+ 0 - 1
src/layouts/default/setting/handler.ts

@@ -160,7 +160,6 @@ export function handler(event: HandlerEnum, value: any): DeepPartial<ProjectConf
 
     // ============header==================
     case HandlerEnum.HEADER_THEME:
-      console.log('debug here');
       updateHeaderBgColor(value);
       return { headerSetting: { bgColor: value } };
 

+ 2 - 1
src/utils/threejs/main.worker.ts

@@ -60,7 +60,8 @@ export function initModalWorker() {
     'fire/chamber_2023-06-02.glb',
     // 'fire/workFace_2023-06-29.glb',
     // 'fire/tunFace_2025-01-08.glb',
-    'fire/tunFace_2025-01-09.glb',
+    // 'fire/tunFace_2025-01-09.glb',
+    'fire/tunFace_2025-01-11.glb',
     'fire/nitrogen_2023-06-02.glb',
     // 'fire/nitrogenUnderground_2023-09-15.glb',
     'fire/nitrogenUnderground_2024-04-09.glb',

+ 310 - 310
src/views/vent/bundleSpy/bundleSpyTable/index.vue

@@ -41,351 +41,351 @@
 </template>
 
 <script setup lang="ts">
-  import { ref, onMounted, reactive, shallowRef } from 'vue';
-  import { columns } from './bundleSpy-table.data';
-  import { getbundleSpyInfoList, getAllFileList } from './bundleSpy-table.api';
-  import customHeader from '/@/components/vent/customHeader.vue';
-  import * as echarts from 'echarts';
-  import BlastDelta from './modal/blastDelta.vue';
-  import { Progress } from 'ant-design-vue';
-  // import 'ant-design-vue/dist/antd.css'; // 引入样式
-  let selectList = ref<any[]>([]);
+import { ref, onMounted, reactive, shallowRef } from 'vue';
+import { columns } from './bundleSpy-table.data';
+import { getbundleSpyInfoList, getAllFileList } from './bundleSpy-table.api';
+import customHeader from '/@/components/vent/customHeader.vue';
+import * as echarts from 'echarts';
+import BlastDelta from './modal/blastDelta.vue';
+import { Progress } from 'ant-design-vue';
+// import 'ant-design-vue/dist/antd.css'; // 引入样式
+let selectList = ref<any[]>([]);
 
-  let formSearch = reactive({
-    pageNum: 1,
-    pageSize: 1000,
-    fileId: '',
-    fileName: '',
-  });
-  const latentCount = ref(0); // 缓慢氧化阶段(潜伏期)
-  const selfHeatingCount = ref(0); // 加速氧化阶段(自热期)
-  const combustionCount = ref(0); // 剧烈氧化阶段(燃烧期)
-  const latentPercent = ref(0); // 缓慢氧化阶段(潜伏期)
-  const selfHeatingPercent = ref(0); // 加速氧化阶段(自热期)
-  const combustionPercent = ref(0); // 剧烈氧化阶段(燃烧期)
-  let tableData = ref<any[]>([]);
-  let selectedFileId = ref<string | null>(null);
-  let modalVisible = ref(false);
-  const posMonitor = shallowRef({});
-  //获取色谱仪报表
-  async function getTableList(params: any) {
-    let res = await getbundleSpyInfoList({ type: 'bundleSpy', ...params });
-    const content = res.content;
-    let contentArr = JSON.parse(content);
-    latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化阶段(潜伏期)').length;
-    selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段(自热期)').length;
-    combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段(燃烧期)').length;
-    const total = contentArr.length;
-    latentPercent.value = (latentCount.value / total) * 100;
-    selfHeatingPercent.value = (selfHeatingCount.value / total) * 100;
-    combustionPercent.value = (combustionCount.value / total) * 100;
-    tableData.value = contentArr;
-    updateChart(contentArr);
-  }
-  //跳转到爆炸三角形
-  function toDetail(record: any) {
-    posMonitor.value = record;
-    console.log(posMonitor.value);
-    modalVisible.value = true;
-  }
-  //折线图
-  function updateChart(data: any) {
-    const chartDom = document.getElementById('lineChart');
-    const myChart = echarts.init(chartDom);
-    const categories = data.map((item: any) => item.jcdd);
-    const c2h2AveValues = data.map((item: any) => parseFloat(item.c2h2_ave));
-    const c2h4AveValues = data.map((item: any) => parseFloat(item.c2h4_ave));
-    const ch4AveValues = data.map((item: any) => parseFloat(item.ch4_ave));
-    const co2AveValues = data.map((item: any) => parseFloat(item.co2_ave));
-    const coAveValues = data.map((item: any) => parseFloat(item.co_ave));
-    const o2AveValues = data.map((item: any) => parseFloat(item.o2_ave));
-    const n2AveValues = data.map((item: any) => parseFloat(item.n2_ave));
-    const c2h6AveValues = data.map((item: any) => parseFloat(item.c2h6_ave));
+let formSearch = reactive({
+  pageNum: 1,
+  pageSize: 1000,
+  fileId: '',
+  fileName: '',
+});
+const latentCount = ref(0); // 缓慢氧化阶段(潜伏期)
+const selfHeatingCount = ref(0); // 加速氧化阶段(自热期)
+const combustionCount = ref(0); // 剧烈氧化阶段(燃烧期)
+const latentPercent = ref(0); // 缓慢氧化阶段(潜伏期)
+const selfHeatingPercent = ref(0); // 加速氧化阶段(自热期)
+const combustionPercent = ref(0); // 剧烈氧化阶段(燃烧期)
+let tableData = ref<any[]>([]);
+let selectedFileId = ref<string | null>(null);
+let modalVisible = ref(false);
+const posMonitor = shallowRef({});
+//获取色谱仪报表
+async function getTableList(params: any) {
+  let res = await getbundleSpyInfoList({ type: 'bundleSpy', ...params });
+  const content = res.content;
+  let contentArr = JSON.parse(content);
+  latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化阶段(潜伏期)').length;
+  selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段(自热期)').length;
+  combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段(燃烧期)').length;
+  const total = contentArr.length;
+  latentPercent.value = (latentCount.value / total) * 100;
+  selfHeatingPercent.value = (selfHeatingCount.value / total) * 100;
+  combustionPercent.value = (combustionCount.value / total) * 100;
+  tableData.value = contentArr;
+  updateChart(contentArr);
+}
+//跳转到爆炸三角形
+function toDetail(record: any) {
+  posMonitor.value = record;
+  console.log(posMonitor.value);
+  modalVisible.value = true;
+}
+//折线图
+function updateChart(data: any) {
+  const chartDom = document.getElementById('lineChart');
+  const myChart = echarts.init(chartDom);
+  const categories = data.map((item: any) => item.jcdd);
+  const c2h2AveValues = data.map((item: any) => parseFloat(item.c2h2_ave));
+  const c2h4AveValues = data.map((item: any) => parseFloat(item.c2h4_ave));
+  const ch4AveValues = data.map((item: any) => parseFloat(item.ch4_ave));
+  const co2AveValues = data.map((item: any) => parseFloat(item.co2_ave));
+  const coAveValues = data.map((item: any) => parseFloat(item.co_ave));
+  const o2AveValues = data.map((item: any) => parseFloat(item.o2_ave));
+  const n2AveValues = data.map((item: any) => parseFloat(item.n2_ave));
+  const c2h6AveValues = data.map((item: any) => parseFloat(item.c2h6_ave));
 
-    const option = {
-      title: {
-        text: '色谱仪报表分析',
-        textStyle: {
-          color: '#ffffff', // 设置标题颜色
-        },
-        left: 'center', // 水平居中
-        top: '0', // 设置标题距离顶部的距离
+  const option = {
+    title: {
+      text: '色谱仪报表分析',
+      textStyle: {
+        color: '#ffffff', // 设置标题颜色
       },
-      tooltip: {
-        trigger: 'axis',
-        backgroundColor: 'rgba(28, 72, 105, 0.5)', // 设置 tooltip 背景为透明
-        textStyle: {
-          color: '#ffffff', // 设置 tooltip 字体颜色为白色
-        },
-        axisPointer: {
-          label: {
-            show: true,
-            backgroundColor: '#071c44',
-          },
-        },
+      left: 'center', // 水平居中
+      top: '0', // 设置标题距离顶部的距离
+    },
+    tooltip: {
+      trigger: 'axis',
+      backgroundColor: 'rgba(28, 72, 105, 0.5)', // 设置 tooltip 背景为透明
+      textStyle: {
+        color: '#ffffff', // 设置 tooltip 字体颜色为白色
       },
-      legend: {
-        top: '9%',
-        textStyle: {
-          color: '#ffffffff',
+      axisPointer: {
+        label: {
+          show: true,
+          backgroundColor: '#071c44',
         },
-        width: '80%', // 设置图例的宽度
-        orient: 'horizontal', // 水平布局
-        pageIconColor: '#ffffff', // 设置翻页图标颜色
-        pageTextStyle: {
-          color: '#ffffff', // 设置翻页文字颜色
+      },
+    },
+    legend: {
+      top: '9%',
+      textStyle: {
+        color: '#ffffffff',
+      },
+      width: '80%', // 设置图例的宽度
+      orient: 'horizontal', // 水平布局
+      pageIconColor: '#ffffff', // 设置翻页图标颜色
+      pageTextStyle: {
+        color: '#ffffff', // 设置翻页文字颜色
+      },
+    },
+    xAxis: {
+      type: 'category',
+      data: categories,
+      splitLine: { show: true, lineStyle: { color: 'rgba(28, 72, 105, 0.5)' } },
+      axisLabel: {
+        interval: 0, // 显示所有标签
+        color: '#ffffff', // 设置 x 轴字体颜色
+        formatter: function (value: string) {
+          return value.length > 12 ? value.slice(0, 12) + '...' : value; // 截断长标签
         },
       },
-      xAxis: {
-        type: 'category',
-        data: categories,
-        splitLine: { show: true, lineStyle: { color: 'rgba(28, 72, 105, 0.5)' } },
+    },
+    yAxis: [
+      {
+        type: 'value',
+        name: 'O₂/N₂',
+        max: 100,
+        splitLine: { show: true, lineStyle: { color: 'rgba(21,80,126,.5)' } },
         axisLabel: {
-          interval: 0, // 显示所有标签
-          color: '#ffffff', // 设置 x 轴字体颜色
-          formatter: function (value: string) {
-            return value.length > 12 ? value.slice(0, 12) + '...' : value; // 截断长标签
-          },
+          color: '#ffffff',
         },
       },
-      yAxis: [
-        {
-          type: 'value',
-          name: 'O₂/N₂',
-          max: 100,
-          splitLine: { show: true, lineStyle: { color: 'rgba(21,80,126,.5)' } },
-          axisLabel: {
-            color: '#ffffff',
-          },
-        },
-        {
-          type: 'value',
-          name: '其他气体',
-          splitLine: { show: true, lineStyle: { color: 'rgba(21,80,126,.5)' } },
-          axisLabel: {
-            color: '#ffffff', // 设置 y 轴字体颜色
-          },
+      {
+        type: 'value',
+        name: '其他气体',
+        splitLine: { show: true, lineStyle: { color: 'rgba(21,80,126,.5)' } },
+        axisLabel: {
+          color: '#ffffff', // 设置 y 轴字体颜色
         },
-      ],
-      grid: {
-        top: '21%', // 设置 grid 距离顶部的距离,增加间隔
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true,
       },
-      series: [
-        {
-          name: 'C₂H₂平均值',
-          data: c2h2AveValues,
-          type: 'bar',
-          yAxisIndex: 1,
-        },
-        {
-          name: 'C₂H₄平均值',
-          data: c2h4AveValues,
-          type: 'bar',
-          yAxisIndex: 1,
-        },
-        {
-          name: 'CH₄平均值',
-          data: ch4AveValues,
-          yAxisIndex: 1,
-          type: 'bar',
-        },
-        {
-          name: 'CO₂平均值',
-          data: co2AveValues,
-          yAxisIndex: 1,
-          type: 'bar',
-        },
-        {
-          name: 'CO平均值',
-          data: coAveValues,
-          yAxisIndex: 1,
-          type: 'bar',
-        },
-        {
-          name: 'O₂平均值',
-          data: o2AveValues,
-          yAxisIndex: 0,
-          type: 'bar',
-        },
-        {
-          name: 'N₂平均值',
-          data: n2AveValues,
-          yAxisIndex: 0,
-          type: 'bar',
-        },
-        {
-          name: 'C2H6平均值',
-          data: c2h6AveValues,
-          yAxisIndex: 1,
-          type: 'bar',
-        },
-      ],
-    };
-    myChart.setOption(option);
+    ],
+    grid: {
+      top: '21%', // 设置 grid 距离顶部的距离,增加间隔
+      left: '3%',
+      right: '4%',
+      bottom: '3%',
+      containLabel: true,
+    },
+    series: [
+      {
+        name: 'C₂H₂平均值',
+        data: c2h2AveValues,
+        type: 'bar',
+        yAxisIndex: 1,
+      },
+      {
+        name: 'C₂H₄平均值',
+        data: c2h4AveValues,
+        type: 'bar',
+        yAxisIndex: 1,
+      },
+      {
+        name: 'CH₄平均值',
+        data: ch4AveValues,
+        yAxisIndex: 1,
+        type: 'bar',
+      },
+      {
+        name: 'CO₂平均值',
+        data: co2AveValues,
+        yAxisIndex: 1,
+        type: 'bar',
+      },
+      {
+        name: 'CO平均值',
+        data: coAveValues,
+        yAxisIndex: 1,
+        type: 'bar',
+      },
+      {
+        name: 'O₂平均值',
+        data: o2AveValues,
+        yAxisIndex: 0,
+        type: 'bar',
+      },
+      {
+        name: 'N₂平均值',
+        data: n2AveValues,
+        yAxisIndex: 0,
+        type: 'bar',
+      },
+      {
+        name: 'C2H6平均值',
+        data: c2h6AveValues,
+        yAxisIndex: 1,
+        type: 'bar',
+      },
+    ],
+  };
+  myChart.setOption(option);
+}
+//获取所有文件列表
+async function getAllFile() {
+  let res = await getAllFileList({ type: 'bundleSpy' });
+  selectList.value = res.records.map((item: any) => ({
+    fileId: item.fileId,
+    fileName: item.fileName,
+  }));
+  if (selectList.value.length > 0) {
+    formSearch.fileId = selectList.value[0].fileId;
+    getSearch();
   }
-  //获取所有文件列表
-  async function getAllFile() {
-    let res = await getAllFileList({ type: 'bundleSpy' });
-    selectList.value = res.records.map((item: any) => ({
-      fileId: item.fileId,
-      fileName: item.fileName,
-    }));
+}
+// 处理文件点击事件
+function handleFileClick(item: any) {
+  formSearch.fileId = item.fileId;
+  formSearch.fileName = item.fileName;
+  selectedFileId.value = item.fileId;
+  getSearch();
+}
+//查询
+function getSearch() {
+  const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
+  const params = {
+    fileId: formSearch.fileId,
+    fileName: selectedFile ? selectedFile.fileName : '',
+  };
+  getTableList(params);
+}
+onMounted(() => {
+  getTableList({ type: 'bundleSpy' });
+  getAllFile().then(() => {
     if (selectList.value.length > 0) {
       formSearch.fileId = selectList.value[0].fileId;
+      selectedFileId.value = selectList.value[0].fileId;
       getSearch();
     }
-  }
-  // 处理文件点击事件
-  function handleFileClick(item: any) {
-    formSearch.fileId = item.fileId;
-    formSearch.fileName = item.fileName;
-    selectedFileId.value = item.fileId;
-    getSearch();
-  }
-  //查询
-  function getSearch() {
-    const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
-    const params = {
-      fileId: formSearch.fileId,
-      fileName: selectedFile ? selectedFile.fileName : '',
-    };
-    getTableList(params);
-  }
-  onMounted(() => {
-    getTableList({ type: 'bundleSpy' });
-    getAllFile().then(() => {
-      if (selectList.value.length > 0) {
-        formSearch.fileId = selectList.value[0].fileId;
-        selectedFileId.value = selectList.value[0].fileId;
-        getSearch();
-      }
-    });
   });
+});
 </script>
 
 <style lang="less" scoped>
-  @import '/@/design/theme.less';
+@import '/@/design/theme.less';
 
-  .content-container {
-    display: flex;
-    width: 100%;
-    height: 100%;
-    padding-top: 54px;
-  }
+.content-container {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  padding-top: 54px;
+}
 
-  .file-list {
-    width: 20%;
-    padding: 10px;
-    margin-right: 10px;
-    margin-bottom: 50px;
-    border: 1px solid #99e8ff66;
-    background: #27546e1a;
-    box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
-    -moz-box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
-    -webkit-box-shadow: 0px 0px 50px 1px rgb(149 235 255 / 5%) inset;
-  }
+.file-list {
+  width: 20%;
+  padding: 10px;
+  margin-right: 10px;
+  margin-bottom: 50px;
+  border: 1px solid #99e8ff66;
+  background: #27546e1a;
+  box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+  -moz-box-shadow: 0px 0px 20px 7px rgba(145, 233, 254, 0.7) inset;
+  -webkit-box-shadow: 0px 0px 50px 1px rgb(149 235 255 / 5%) inset;
+}
 
-  .file-list ul {
-    list-style: none;
-    padding: 0;
-  }
+.file-list ul {
+  list-style: none;
+  padding: 0;
+}
 
-  .file-list li {
-    color: #fff;
-    padding: 5px;
-    cursor: pointer;
-  }
+.file-list li {
+  color: #fff;
+  padding: 5px;
+  cursor: pointer;
+}
 
-  .file-list li:hover,
-  .file-list li.selected {
-    background: #1c4869;
-  }
+.file-list li:hover,
+.file-list li.selected {
+  background: #1c4869;
+}
 
-  .table-container {
-    margin-top: 10px;
-    width: 80%;
-    box-sizing: border-box;
-  }
+.table-container {
+  margin-top: 10px;
+  width: 80%;
+  box-sizing: border-box;
+}
 
-  .dustMonitor {
-    width: 100%;
-    height: 100%;
-    padding: 10px 10px 15px 10px;
-    box-sizing: border-box;
-    position: relative;
-  }
+.dustMonitor {
+  width: 100%;
+  height: 100%;
+  padding: 10px 10px 15px 10px;
+  box-sizing: border-box;
+  position: relative;
+}
 
-  :deep(.zxm-table-thead > tr > th:last-child) {
-    border-right: 1px solid #91e9fe !important;
-  }
+:deep(.zxm-table-thead > tr > th:last-child) {
+  border-right: 1px solid #91e9fe !important;
+}
 
-  :deep(.zxm-picker-input > input) {
-    color: #fff;
-  }
+:deep(.zxm-picker-input > input) {
+  color: #fff;
+}
 
-  :deep(.zxm-select:not(.zxm-select-customize-input) .zxm-select-selector) {
-    border: 1px solid var(--vent-form-item-border) !important;
-    background-color: #ffffff00 !important;
-  }
+:deep(.zxm-select:not(.zxm-select-customize-input) .zxm-select-selector) {
+  border: 1px solid var(--vent-form-item-border) !important;
+  background-color: #ffffff00 !important;
+}
 
-  :deep(.zxm-select-selection-item) {
-    color: #fff !important;
-  }
-  .data-container {
-    display: flex;
-    width: 100%;
-    height: 100%;
-  }
+:deep(.zxm-select-selection-item) {
+  color: #fff !important;
+}
+.data-container {
+  display: flex;
+  width: 100%;
+  height: 100%;
+}
 
-  .line-chart {
-    flex: 3; /* 占据 3/4 的空间 */
-    width: 100%;
-    height: 400px;
-  }
-  .data-content {
-    flex: 1; /* 占据 1/4 的空间 */
-    height: 400px;
-    display: flex;
-    flex-direction: column; /* 垂直排列进度条 */
-    // align-items: center; /* 水平居中 */
-    margin: 10px;
-    .title {
-      font-size: 18px;
-      font-weight: 600;
-      color: #fff;
-      margin-bottom: 20px;
-    }
-    .explain {
-      color: var(--vent-table-action-link);
-      margin-top: 18px;
-    }
-  }
-  .progress {
-    width: 100%;
-    height: 20px;
-    margin-top: 10px;
-  }
-  .progress-label {
-    margin-top: 20px;
-    text-align: left;
-    margin-bottom: 5px;
+.line-chart {
+  flex: 3; /* 占据 3/4 的空间 */
+  width: 100%;
+  height: 400px;
+}
+.data-content {
+  flex: 1; /* 占据 1/4 的空间 */
+  height: 400px;
+  display: flex;
+  flex-direction: column; /* 垂直排列进度条 */
+  // align-items: center; /* 水平居中 */
+  margin: 10px;
+  .title {
+    font-size: 18px;
+    font-weight: 600;
     color: #fff;
+    margin-bottom: 20px;
   }
-  ::deep .progress-text {
-    color: #fff !important; /* 自定义百分比文字颜色 */
-  }
-  .blast-delta-container {
-    margin: 50px;
-  }
-  .yellow-progress .ant-progress-bg {
-    background-color: yellow !important;
+  .explain {
+    color: var(--vent-table-action-link);
+    margin-top: 18px;
   }
+}
+.progress {
+  width: 100%;
+  height: 20px;
+  margin-top: 10px;
+}
+.progress-label {
+  margin-top: 20px;
+  text-align: left;
+  margin-bottom: 5px;
+  color: #fff;
+}
+::deep .progress-text {
+  color: #fff !important; /* 自定义百分比文字颜色 */
+}
+.blast-delta-container {
+  margin: 50px;
+}
+.yellow-progress .ant-progress-bg {
+  background-color: yellow !important;
+}
 
-  :deep(.zxm-table-thead > tr > th:last-child) {
-    border-right: 1px solid #91e9fe !important;
-  }
+:deep(.zxm-table-thead > tr > th:last-child) {
+  border-right: 1px solid #91e9fe !important;
+}
 </style>

+ 2 - 2
src/views/vent/home/configurable/components/ModuleCommon.vue

@@ -64,11 +64,11 @@
   @import '/@/design/theme.less';
 
   .module-common .box1-center {
-    height: calc(100% - 70px);
+    height: calc(100% - 48px);
   }
 
   :deep(.box1-center) {
-    height: calc(100% - 70px);
+    height: calc(100% - 48px);
   }
   :deep(.box1-center > .box-container) {
     height: 100%;

+ 0 - 74
src/views/vent/home/configurable/components/ModuleDHZ.vue

@@ -1,74 +0,0 @@
-<template>
-  <!-- 常用模块 -->
-  <ventBox1 class="module-common" :style="style">
-    <template v-if="moduleName" #title>
-      <div :class="{ 'cursor-pointer': !!moduleData.to }" @click="redirectTo">{{ moduleName }}</div>
-    </template>
-    <template #container>
-      <slot>
-        <Header :deviceType="deviceType" :moduleData="moduleData" :data="data" @select="selectedData = $event" />
-        <Content :style="{ height: header.show ? 'calc(100% - 30px)' : '100%' }" :moduleData="moduleData" :data="selectedData" />
-      </slot>
-    </template>
-  </ventBox1>
-</template>
-<script lang="ts" setup>
-  import Header from './header.vue';
-  import Content from './content.vue';
-  // import ModuleLeft from './original/moduleLeft.vue';
-  // import ModuleBottom from './original/moduleBottom.vue';
-  import { computed, ref } from 'vue';
-  import ventBox1 from '/@/components/vent/ventBox1.vue';
-  import { openWindow } from '/@/utils';
-  // import { ModuleProps } from '../types';
-
-  const props = defineProps<{
-    /** 配置的详细模块信息 */
-    moduleData: any;
-    /** 配置的详细样式信息 */
-    showStyle: any;
-    /** 该模块配置中的设备标识符 */
-    deviceType: string;
-    /** api返回的数据 */
-    data: any;
-    moduleName: string;
-    visible: boolean;
-  }>();
-  defineEmits(['close', 'click']);
-
-  const { header } = props.moduleData;
-  const selectedData = ref();
-
-  const style = computed(() => {
-    const size = props.showStyle.size;
-    const position = props.showStyle.position;
-    return size + position + 'position: absolute;';
-  });
-
-  // 根据配置里的定位判断应该使用哪个module组件
-  // function getModuleComponent(position) {
-  //   if (position === '中下') {
-  //     return ModuleBottom;
-  //   }
-  //   return ModuleLeft;
-  // }
-
-  function redirectTo() {
-    const { to } = props.moduleData;
-    if (!to) return;
-    openWindow(to);
-  }
-</script>
-<style scoped>
-  .module-common .box1-center {
-    height: calc(100% - 70px);
-  }
-  :deep(.box1-center) {
-    height: calc(100% - 70px);
-  }
-  :deep(.box1-center > .box-container) {
-    height: 100%;
-    padding: 0 !important;
-    width: 100% !important;
-  }
-</style>

+ 0 - 1
src/views/vent/home/configurable/components/preset/MeasureDetail.vue

@@ -54,7 +54,6 @@
   watch(
     () => props.compositeData,
     (newS) => {
-      console.log('debug', newS);
       selectData.value = newS;
     },
     {

+ 65 - 8
src/views/vent/monitorManager/alarmMonitor/common/closeWall.vue

@@ -40,6 +40,14 @@
           <span>{{ topContent.smokeJd || '-' }}</span>
         </div>
       </div>
+      <div class="pl-10px pr-10px">
+        <div class="mb-10px">
+          <AButton class="w-full" type="primary" @click="controlDevice('dianwei', 'zhi')">应急启动</AButton>
+        </div>
+        <div>
+          <AButton class="w-full" type="primary" @click="controlDevice('dianwei', 'zhi')">应急关闭</AButton>
+        </div>
+      </div>
     </div>
     <div class="content">
       <div class="title-b">采空区密闭参数</div>
@@ -105,16 +113,18 @@
 </template>
 
 <script lang="ts" setup>
-  import { onMounted, ref, reactive, watch, defineProps } from 'vue';
+  import { ref, reactive, watch, defineProps, inject, h } from 'vue';
   import echartLine1 from './echartLine1.vue';
   import warnZb from './warnZb.vue';
   import PredictionCurve from './predictionCurve.vue';
-  import BaseTab from '../../../gas/components/tab/baseTab.vue';
+  import { Modal, Input } from 'ant-design-vue';
+  import { deviceControlApi } from '/@/api/vent/index';
 
   let props = defineProps({
     listData: Object,
   });
 
+  const globalConfig = inject('globalConfig');
   const shownChart = ref('default');
   let maxY = ref<any>(0);
   let selectSj = ref<any[]>([]);
@@ -122,7 +132,7 @@
   let selectList = reactive<any[]>([]);
   let widthV = ref('75%');
   let heightV = ref('80%');
-  let coordDw = ref<any[]>([31,62, 110]);
+  let coordDw = ref<any[]>([31, 62, 110]);
   let widthCanvas = ref(562);
   let heightCanvas = ref(316);
   //设备连接状态
@@ -388,6 +398,50 @@
     netStatus.value = data['netStatus'];
   }
 
+  // 设备控制
+  function controlDevice(code, value?) {
+    const passWord = ref('');
+    Modal.confirm({
+      title: '是否确认执行该操作?',
+      maskClosable: true,
+      content: () => {
+        return h(Input, {
+          placeholder: '请输入密码',
+          type: 'password',
+          modelValue: passWord.value,
+          'onUpdate:value'(val) {
+            passWord.value = val;
+          },
+        });
+      },
+      onOk() {
+        console.log('OK', passWord);
+      },
+    });
+    // Promise.all(
+    //   [].map(({ deviceID, deviceType }) => {
+    //     return deviceControlApi({
+    //       deviceid: deviceID,
+    //       devicetype: deviceType,
+    //       paramcode: code,
+    //       value,
+    //       // password: passWord || globalConfig?.simulatedPassword,
+    //     });
+    //   })
+    // ).then((res) => {
+    //   // 模拟时开启
+    //   if (res.success) {
+    //     if (globalConfig.History_Type == 'remote') {
+    //       message.success('指令已下发至生产管控平台成功!');
+    //     } else {
+    //       message.success('指令已下发成功!');
+    //     }
+    //   } else {
+    //     message.error(res.message);
+    //   }
+    // });
+  }
+
   /** 预测曲线的配置,数据分别为平均、最大、最小、当前值 */
   const curveConfig = ref<any>({ id: '0', label: '', time: new Date(), data: [0, 0, 0, 0] });
 
@@ -510,8 +564,9 @@
         display: flex;
 
         &:nth-child(1) {
-          justify-content: space-around;
+          justify-content: space-between;
           align-items: center;
+          padding: 0px 40px;
           flex: 2;
           height: 100%;
           border-right: 2px solid;
@@ -524,13 +579,15 @@
           justify-content: space-around;
           align-items: center;
           height: 73%;
+          border-right: 2px solid;
+          border-image: var(--border-image-2) 1 1 1;
         }
 
         .contents {
           height: 73%;
 
           &:nth-child(1) {
-            width: 40%;
+            width: 50%;
             display: flex;
             flex-direction: column;
             justify-content: space-around;
@@ -554,17 +611,17 @@
           }
 
           &:nth-child(2) {
-            width: 40%;
+            width: 50%;
             display: flex;
             justify-content: center;
             align-items: center;
 
             img {
               position: relative;
-              width: 23%;
+              width: 90px;
               height: 100%;
               background: var(--image-pj) no-repeat center;
-              background-size: 50% 50%;
+              background-size: 90px 50%;
             }
 
             .text {

+ 72 - 0
src/views/vent/monitorManager/comment/DustingTable.vue

@@ -0,0 +1,72 @@
+<template>
+  <MonitorTable
+    ref="monitorTable"
+    :columnsType="`${deviceType}_monitor`"
+    :dataSource="dataSource"
+    design-scope="device_monitor"
+    :isShowActionColumn="true"
+    :isShowSelect="false"
+    title="设备监测"
+    :scroll="{ y: scroll.y - 30 }"
+  >
+    <template #action="{ record }">
+      <TableAction
+        :actions="[
+          {
+            label: '报表录入',
+            onClick: (e) => deviceEdit(e, 'reportInfo', record),
+          },
+          {
+            label: '定位',
+            onClick: () => $emit('locate', record),
+          },
+        ]"
+      />
+    </template>
+    <template #filterCell="{ column, record }">
+      <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == 0 ? 'green' : record.warnFlag == 1 ? '#FF5812' : 'gray'">
+        {{ record.warnFlag == 0 ? '正常' : record.warnFlag == 1 ? '报警' : record.warnFlag == 2 ? '断开' : '未监测' }}
+      </a-tag>
+      <template v-else-if="column.dataIndex === 'warnLevel'">
+        <a-tag v-if="record.warnLevel == '101'" color="green">低风险</a-tag>
+        <a-tag v-else-if="record.warnLevel == '102'" color="#FF5812">一般风险</a-tag>
+        <a-tag v-else-if="record.warnLevel == '103'" color="#FF5812">较大风险</a-tag>
+        <a-tag v-else-if="record.warnLevel == '104'" color="#FF5812">重大风险</a-tag>
+        <a-tag v-else-if="record.warnLevel == '201'" color="#FF0000">报警</a-tag>
+        <a-tag v-else-if="record.warnLevel == '10000'" color="#FF5812">数据超限</a-tag>
+        <a-tag v-else-if="record.warnLevel == '1001'" color="default">网络中断</a-tag>
+        <a-tag v-else color="green">正常</a-tag>
+      </template>
+      <a-tag v-if="column.dataIndex === 'netStatus'" :color="record.netStatus == '0' ? '#f00' : 'green'">
+        {{ record.netStatus == '0' ? '断开' : '连接' }}
+      </a-tag>
+    </template>
+  </MonitorTable>
+  <DeviceBaseInfo @register="registerModal" :device-type="deviceType" />
+</template>
+
+<script lang="ts" setup>
+  import MonitorTable from './MonitorTable.vue';
+  import DeviceBaseInfo from './components/DeviceBaseInfo.vue';
+  import { TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  //   import { ref } from 'vue';
+
+  defineProps<{
+    deviceType: string;
+    dataSource: any[];
+    scroll: { y: number };
+  }>();
+
+  defineEmits(['locate']);
+
+  const [registerModal, { openModal }] = useModal();
+
+  function deviceEdit(e: Event, type: string, record) {
+    e.stopPropagation();
+    openModal(true, {
+      type,
+      deviceId: record['deviceID'],
+    });
+  }
+</script>

+ 102 - 102
src/views/vent/monitorManager/comment/bundleMonitorTable.vue

@@ -17,134 +17,134 @@
       </a-row>
     </div>
     <div class="content-area">
-      <a-table :columns="bundleColumns" :data-source="tableData" size="small" class="tableW"> </a-table>
+      <a-table :columns="bundleColumns" :data-source="tableData" size="small" class="tableW" :scroll="{ y: 300 }"> </a-table>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-  import { ref, onMounted, reactive } from 'vue';
-  import { bundleColumns } from './comment.data';
-  import { getInfoList, getAllFileList } from './comment.api';
-  // import 'ant-design-vue/dist/antd.css'; // 引入样式
-  let selectList = ref<any[]>([]);
-  let jcddArr = ref<any[]>([]);
-  let createBy = ref<any[]>([]);
-  let createTime = ref<any[]>([]);
-  let formSearch = reactive({
-    pageNum: 1,
-    pageSize: 1000,
-    fileId: '',
-    fileName: '',
-  });
-  const latentCount = ref(0); // 缓慢氧化阶段(潜伏期)
-  const selfHeatingCount = ref(0); // 加速氧化阶段(自热期)
-  const combustionCount = ref(0); // 剧烈氧化阶段(燃烧期)
-  const latentPercent = ref(0); // 缓慢氧化阶段(潜伏期)
-  const selfHeatingPercent = ref(0); // 加速氧化阶段(自热期)
-  const combustionPercent = ref(0); // 剧烈氧化阶段(燃烧期)
-  let tableData = ref<any[]>([]);
-  let selectedFileId = ref<string | null>(null);
-  //获取束管日报
-  async function getTableList(params: any) {
-    let res = await getInfoList({ type: 'bundle', ...params });
-    const content = res.content;
-    let contentArr = JSON.parse(content);
-    createBy.value = res.createBy;
-    createTime.value = res.createTime;
-    latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化阶段(潜伏期)').length;
-    selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段(自热期)').length;
-    combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段(燃烧期)').length;
-    const total = contentArr.length;
-    latentPercent.value = (latentCount.value / total) * 100;
-    selfHeatingPercent.value = (selfHeatingCount.value / total) * 100;
-    combustionPercent.value = (combustionCount.value / total) * 100;
-    tableData.value = contentArr;
-  }
+import { ref, onMounted, reactive } from 'vue';
+import { bundleColumns } from './comment.data';
+import { getInfoList, getAllFileList } from './comment.api';
+// import 'ant-design-vue/dist/antd.css'; // 引入样式
+let selectList = ref<any[]>([]);
+let jcddArr = ref<any[]>([]);
+let createBy = ref<any[]>([]);
+let createTime = ref<any[]>([]);
+let formSearch = reactive({
+  pageNum: 1,
+  pageSize: 1000,
+  fileId: '',
+  fileName: '',
+});
+const latentCount = ref(0); // 缓慢氧化阶段(潜伏期)
+const selfHeatingCount = ref(0); // 加速氧化阶段(自热期)
+const combustionCount = ref(0); // 剧烈氧化阶段(燃烧期)
+const latentPercent = ref(0); // 缓慢氧化阶段(潜伏期)
+const selfHeatingPercent = ref(0); // 加速氧化阶段(自热期)
+const combustionPercent = ref(0); // 剧烈氧化阶段(燃烧期)
+let tableData = ref<any[]>([]);
+let selectedFileId = ref<string | null>(null);
+//获取束管日报
+async function getTableList(params: any) {
+  let res = await getInfoList({ type: 'bundle', ...params });
+  const content = res.content;
+  let contentArr = JSON.parse(content);
+  createBy.value = res.createBy;
+  createTime.value = res.createTime;
+  latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化阶段(潜伏期)').length;
+  selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段(自热期)').length;
+  combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段(燃烧期)').length;
+  const total = contentArr.length;
+  latentPercent.value = (latentCount.value / total) * 100;
+  selfHeatingPercent.value = (selfHeatingCount.value / total) * 100;
+  combustionPercent.value = (combustionCount.value / total) * 100;
+  tableData.value = contentArr;
+}
 
-  //获取所有文件列表
-  async function getAllFile() {
-    let res = await getAllFileList({ type: 'bundle' });
-    selectList.value = res.records.map((item: any) => ({
-      fileId: item.fileId,
-      fileName: item.fileName,
-    }));
-    jcddArr.value = res.records.map((item: any) => ({
-      fileId: item.jcdd,
-    }));
+//获取所有文件列表
+async function getAllFile() {
+  let res = await getAllFileList({ type: 'bundle' });
+  selectList.value = res.records.map((item: any) => ({
+    fileId: item.fileId,
+    fileName: item.fileName,
+  }));
+  jcddArr.value = res.records.map((item: any) => ({
+    fileId: item.jcdd,
+  }));
+  if (selectList.value.length > 0) {
+    formSearch.fileId = selectList.value[0].fileId;
+    getSearch();
+  }
+}
+//查询
+function getSearch() {
+  const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
+  const params = {
+    fileId: formSearch.fileId,
+    fileName: selectedFile ? selectedFile.fileName : '',
+  };
+  getTableList(params);
+}
+onMounted(() => {
+  getTableList({ type: 'bundle' });
+  getAllFile().then(() => {
     if (selectList.value.length > 0) {
       formSearch.fileId = selectList.value[0].fileId;
+      selectedFileId.value = selectList.value[0].fileId;
       getSearch();
     }
-  }
-  //查询
-  function getSearch() {
-    const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
-    const params = {
-      fileId: formSearch.fileId,
-      fileName: selectedFile ? selectedFile.fileName : '',
-    };
-    getTableList(params);
-  }
-  onMounted(() => {
-    getTableList({ type: 'bundle' });
-    getAllFile().then(() => {
-      if (selectList.value.length > 0) {
-        formSearch.fileId = selectList.value[0].fileId;
-        selectedFileId.value = selectList.value[0].fileId;
-        getSearch();
-      }
-    });
   });
+});
 </script>
 
 <style lang="less" scoped>
-  @ventSpace: zxm;
-  .dustMonitor {
-    .search-area {
-      margin: 15px;
+@ventSpace: zxm;
+.dustMonitor {
+  .search-area {
+    margin: 15px;
 
-      .area-item {
-        display: flex;
-        align-items: center;
+    .area-item {
+      display: flex;
+      align-items: center;
 
-        .item-text {
-          color: #fff;
-        }
+      .item-text {
+        color: #fff;
       }
     }
+  }
 
-    .zxm-picker,
-    .zxm-input {
-      border: 1px solid #3ad8ff77;
-      background-color: #ffffff00;
-      color: #fff;
-    }
+  .zxm-picker,
+  .zxm-input {
+    border: 1px solid #3ad8ff77;
+    background-color: #ffffff00;
+    color: #fff;
   }
+}
 
-  :deep(.@{ventSpace}-table-body) {
-    height: auto !important;
+:deep(.@{ventSpace}-table-body) {
+  height: auto !important;
 
-    tr > td {
-      background: #ffffff00 !important;
-    }
+  tr > td {
+    background: #ffffff00 !important;
+  }
 
-    tr.@{ventSpace}-table-row-selected {
-      td {
-        background: #007cc415 !important;
-      }
+  tr.@{ventSpace}-table-row-selected {
+    td {
+      background: #007cc415 !important;
     }
   }
+}
 
-  :deep(.jeecg-basic-table .@{ventSpace}-table-wrapper .@{ventSpace}-table-title) {
-    min-height: 0;
-  }
+:deep(.jeecg-basic-table .@{ventSpace}-table-wrapper .@{ventSpace}-table-title) {
+  min-height: 0;
+}
 
-  :deep(.@{ventSpace}-pagination) {
-    margin-right: 20px !important;
-  }
+:deep(.@{ventSpace}-pagination) {
+  margin-right: 20px !important;
+}
 
-  :deep(.zxm-table-thead > tr > th:last-child) {
-    border-right: 1px solid #91e9fe55 !important;
-  }
+:deep(.zxm-table-thead > tr > th:last-child) {
+  border-right: 1px solid #91e9fe55 !important;
+}
 </style>

+ 97 - 97
src/views/vent/monitorManager/comment/bundleSpyMonitorTable.vue

@@ -16,129 +16,129 @@
         </a-col>
       </a-row>
     </div>
-    <div class="content-area"> <a-table :columns="bundleSpycolumns" :data-source="tableData" size="small" class="tableW" /></div>
+    <div class="content-area"> <a-table :columns="bundleSpycolumns" :data-source="tableData" size="small" class="tableW" :scroll="{ y: 250 }" /></div>
   </div>
 </template>
 
 <script setup lang="ts">
-  import { ref, onMounted, reactive } from 'vue';
-  import { bundleSpycolumns } from './comment.data';
-  import { getInfoList, getAllFileList } from './comment.api';
-  // import 'ant-design-vue/dist/antd.css'; // 引入样式
-  let selectList = ref<any[]>([]);
+import { ref, onMounted, reactive } from 'vue';
+import { bundleSpycolumns } from './comment.data';
+import { getInfoList, getAllFileList } from './comment.api';
+// import 'ant-design-vue/dist/antd.css'; // 引入样式
+let selectList = ref<any[]>([]);
 
-  let formSearch = reactive({
-    pageNum: 1,
-    pageSize: 1000,
-    fileId: '',
-    fileName: '',
-  });
-  const latentCount = ref(0); // 缓慢氧化阶段(潜伏期)
-  const selfHeatingCount = ref(0); // 加速氧化阶段(自热期)
-  const combustionCount = ref(0); // 剧烈氧化阶段(燃烧期)
-  const latentPercent = ref(0); // 缓慢氧化阶段(潜伏期)
-  const selfHeatingPercent = ref(0); // 加速氧化阶段(自热期)
-  const combustionPercent = ref(0); // 剧烈氧化阶段(燃烧期)
-  let createBy = ref<any[]>([]);
-  let createTime = ref<any[]>([]);
-  let tableData = ref<any[]>([]);
-  let selectedFileId = ref<string | null>(null);
-  //获取色谱仪报表
-  async function getTableList(params: any) {
-    let res = await getInfoList({ type: 'bundleSpy', ...params });
-    const content = res.content;
-    let contentArr = JSON.parse(content);
-    createBy.value = res.createBy;
-    createTime.value = res.createTime;
-    latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化阶段(潜伏期)').length;
-    selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段(自热期)').length;
-    combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段(燃烧期)').length;
-    const total = contentArr.length;
-    latentPercent.value = (latentCount.value / total) * 100;
-    selfHeatingPercent.value = (selfHeatingCount.value / total) * 100;
-    combustionPercent.value = (combustionCount.value / total) * 100;
-    tableData.value = contentArr;
+let formSearch = reactive({
+  pageNum: 1,
+  pageSize: 1000,
+  fileId: '',
+  fileName: '',
+});
+const latentCount = ref(0); // 缓慢氧化阶段(潜伏期)
+const selfHeatingCount = ref(0); // 加速氧化阶段(自热期)
+const combustionCount = ref(0); // 剧烈氧化阶段(燃烧期)
+const latentPercent = ref(0); // 缓慢氧化阶段(潜伏期)
+const selfHeatingPercent = ref(0); // 加速氧化阶段(自热期)
+const combustionPercent = ref(0); // 剧烈氧化阶段(燃烧期)
+let createBy = ref<any[]>([]);
+let createTime = ref<any[]>([]);
+let tableData = ref<any[]>([]);
+let selectedFileId = ref<string | null>(null);
+//获取色谱仪报表
+async function getTableList(params: any) {
+  let res = await getInfoList({ type: 'bundleSpy', ...params });
+  const content = res.content;
+  let contentArr = JSON.parse(content);
+  createBy.value = res.createBy;
+  createTime.value = res.createTime;
+  latentCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '缓慢氧化阶段(潜伏期)').length;
+  selfHeatingCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '加速氧化阶段(自热期)').length;
+  combustionCount.value = contentArr.filter((item: any) => item.internalFireWarnLevel === '剧烈氧化阶段(燃烧期)').length;
+  const total = contentArr.length;
+  latentPercent.value = (latentCount.value / total) * 100;
+  selfHeatingPercent.value = (selfHeatingCount.value / total) * 100;
+  combustionPercent.value = (combustionCount.value / total) * 100;
+  tableData.value = contentArr;
+}
+//获取所有文件列表
+async function getAllFile() {
+  let res = await getAllFileList({ type: 'bundleSpy' });
+  selectList.value = res.records.map((item: any) => ({
+    fileId: item.fileId,
+    fileName: item.fileName,
+  }));
+  if (selectList.value.length > 0) {
+    formSearch.fileId = selectList.value[0].fileId;
+    getSearch();
   }
-  //获取所有文件列表
-  async function getAllFile() {
-    let res = await getAllFileList({ type: 'bundleSpy' });
-    selectList.value = res.records.map((item: any) => ({
-      fileId: item.fileId,
-      fileName: item.fileName,
-    }));
+}
+//查询
+function getSearch() {
+  const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
+  const params = {
+    fileId: formSearch.fileId,
+    fileName: selectedFile ? selectedFile.fileName : '',
+  };
+  getTableList(params);
+}
+onMounted(() => {
+  getTableList({ type: 'bundleSpy' });
+  getAllFile().then(() => {
     if (selectList.value.length > 0) {
       formSearch.fileId = selectList.value[0].fileId;
+      selectedFileId.value = selectList.value[0].fileId;
       getSearch();
     }
-  }
-  //查询
-  function getSearch() {
-    const selectedFile = selectList.value.find((item) => item.fileId === formSearch.fileId);
-    const params = {
-      fileId: formSearch.fileId,
-      fileName: selectedFile ? selectedFile.fileName : '',
-    };
-    getTableList(params);
-  }
-  onMounted(() => {
-    getTableList({ type: 'bundleSpy' });
-    getAllFile().then(() => {
-      if (selectList.value.length > 0) {
-        formSearch.fileId = selectList.value[0].fileId;
-        selectedFileId.value = selectList.value[0].fileId;
-        getSearch();
-      }
-    });
   });
+});
 </script>
 
 <style lang="less" scoped>
-  @ventSpace: zxm;
-  .dustMonitor {
-    .search-area {
-      margin: 15px;
+@ventSpace: zxm;
+.dustMonitor {
+  .search-area {
+    margin: 15px;
 
-      .area-item {
-        display: flex;
-        align-items: center;
+    .area-item {
+      display: flex;
+      align-items: center;
 
-        .item-text {
-          color: #fff;
-        }
+      .item-text {
+        color: #fff;
       }
     }
+  }
 
-    .zxm-picker,
-    .zxm-input {
-      border: 1px solid #3ad8ff77;
-      background-color: #ffffff00;
-      color: #fff;
-    }
+  .zxm-picker,
+  .zxm-input {
+    border: 1px solid #3ad8ff77;
+    background-color: #ffffff00;
+    color: #fff;
   }
+}
 
-  :deep(.@{ventSpace}-table-body) {
-    height: auto !important;
+:deep(.@{ventSpace}-table-body) {
+  height: auto !important;
 
-    tr > td {
-      background: #ffffff00 !important;
-    }
+  tr > td {
+    background: #ffffff00 !important;
+  }
 
-    tr.@{ventSpace}-table-row-selected {
-      td {
-        background: #007cc415 !important;
-      }
+  tr.@{ventSpace}-table-row-selected {
+    td {
+      background: #007cc415 !important;
     }
   }
+}
 
-  :deep(.jeecg-basic-table .@{ventSpace}-table-wrapper .@{ventSpace}-table-title) {
-    min-height: 0;
-  }
+:deep(.jeecg-basic-table .@{ventSpace}-table-wrapper .@{ventSpace}-table-title) {
+  min-height: 0;
+}
 
-  :deep(.@{ventSpace}-pagination) {
-    margin-right: 20px !important;
-  }
+:deep(.@{ventSpace}-pagination) {
+  margin-right: 20px !important;
+}
 
-  :deep(.zxm-table-thead > tr > th:last-child) {
-    border-right: 1px solid #91e9fe55 !important;
-  }
+:deep(.zxm-table-thead > tr > th:last-child) {
+  border-right: 1px solid #91e9fe55 !important;
+}
 </style>

+ 11 - 12
src/views/vent/monitorManager/comment/components/DeviceBaseInfo.vue

@@ -11,7 +11,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, defineEmits, onUnmounted, watch, PropType, nextTick, computed } from 'vue';
+  import { onMounted, ref, defineEmits, onUnmounted, watch, computed } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { FormSchema } from '/@/components/Form';
@@ -22,10 +22,10 @@
 
   const emit = defineEmits(['close', 'register']);
   const props = defineProps({
-    formSchema: {
-      type: Array as PropType<FormSchema[]>,
-      default: () => [],
-    },
+    // formSchema: {
+    //   type: Array as PropType<FormSchema[]>,
+    //   default: () => [],
+    // },
     deviceType: {
       type: String,
       default: '',
@@ -33,9 +33,9 @@
   });
   const FormRef = ref();
   const tabType = ref('deviceInfo');
-  const formSchema = ref<FormSchema[]>([]);
+  const formSchema = ref<Array<FormSchema>>([]);
   const formData = ref({});
-  const deviceTypeName = ref('');
+  // const props.deviceType ref('');
   const deviceType = computed(() => props.deviceType);
 
   // const arrToFormColumns = (tableHeaderColumns = [], devicetype) => {
@@ -288,14 +288,14 @@
   });
 
   const [registerForm, { resetSchema, getFieldsValue, setFieldsValue, resetFields }] = useForm({
-    schemas: <FormSchema[]>formSchema.value,
+    schemas: formSchema.value,
     showActionButtonGroup: false,
   });
 
   function getColumns() {
-    let formSchemaArr = getFormSchemaColumns(tabType.value === 'deviceInfo' ? `${deviceTypeName.value}_edit` : `${deviceTypeName.value}_input`) || [];
+    let formSchemaArr = getFormSchemaColumns(tabType.value === 'deviceInfo' ? `${props.deviceType}_edit` : `${props.deviceType}_input`) || [];
     if (formSchemaArr && formSchemaArr.length < 1) {
-      const arr = deviceTypeName.value.split('_');
+      const arr = props.deviceType.split('_');
       formSchemaArr = getFormSchemaColumns(tabType.value === 'deviceInfo' ? arr[0] + '_edit' : arr[0] + '_input') || [];
     }
     arrToFormColumns(formSchemaArr);
@@ -303,8 +303,7 @@
 
   watch(
     () => props.deviceType,
-    (devicetype) => {
-      deviceTypeName.value = devicetype;
+    () => {
       getColumns();
       if (FormRef.value) resetSchema(formSchema.value);
     }

+ 1 - 1
src/views/vent/monitorManager/comment/dustMonitorTable.vue

@@ -16,7 +16,7 @@
         </a-col>
       </a-row>
     </div>
-    <div class="content-area"> <a-table :columns="dsutColumns" :data-source="tableData" size="small" class="tableW" /></div>
+    <div class="content-area"> <a-table :columns="dsutColumns" :data-source="tableData" size="small" class="tableW" :scroll="{ y: 250 }" /></div>
   </div>
 </template>
 

+ 1372 - 1363
src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -335,6 +335,9 @@
             <template v-else-if="deviceType.startsWith('bundleSpyDayReport') && activeKey == '1'">
               <bundleSpyMonitorTable></bundleSpyMonitorTable>
             </template>
+            <template v-else-if="deviceType.startsWith('dusting') && activeKey == '1'">
+              <DustingTable :dataSource="dataSource" :deviceType="deviceType" :scroll="scroll" />
+            </template>
             <template v-else>
               <!-- 工作面echarts图标 -->
               <BarAndLine
@@ -547,1566 +550,1572 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted, ComponentOptions, shallowRef, reactive, defineProps, watch } from 'vue';
-import { SendOutlined, FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons-vue';
-import {
-  list,
-  getDeviceList,
-  getDeviceTypeList,
-  devPosition,
-  getDepartmentInfo,
-  getExportUrl,
-  queryNowGasInsInfo,
-  queryNowGasSta,
-} from './device.api';
-import AlarmHistoryTable from '../../../comment/AlarmHistoryTable.vue';
-import HistoryTable from '../../../comment/HistoryTable.vue';
-import HandlerHistoryTable from '../../../comment/HandlerHistoryTable.vue';
-import MonitorTable from '../../../comment/MonitorTable.vue';
-import GroupMonitorTable from '../../../comment/GroupMonitorTable.vue';
-import gaspatrolTable from '../../../comment/gaspatrolTable.vue';
-import dustMonitorTable from '../../../comment/dustMonitorTable.vue';
-import bundleMonitorTable from '../../../comment/bundleMonitorTable.vue';
-import bundleSpyMonitorTable from '../../../comment/bundleSpyMonitorTable.vue';
-import HistoryBall from './modal/history-ball.vue';
-import { TreeProps, message, Progress, Input, Select } from 'ant-design-vue';
-import { TableAction } from '/@/components/Table';
-import { SvgIcon } from '/@/components/Icon';
-import { getActions } from '/@/qiankun/state';
-import { useRouter } from 'vue-router';
-import { setDivHeight } from '/@/utils/event';
-import {
-  majorColumns,
-  haveSysDetailArr,
-  haveDetailArr,
-  haveHandlerArr,
-  noWarningArr,
-  surfaceChartsColumns,
-  noHistoryArr,
-  getMonitorComponent,
-  vehicleFormConfig,
-} from './device.data';
-import mainPath from './modal/mainPath.vue';
-import { formConfig } from '../../../safetyMonitor/safety.data';
-import { getDictItemsByCode } from '/@/utils/dict';
-import BarAndLine from '/@/components/chart/BarAndLine.vue';
-import MTreeSelect from '/@/components/Form/src/jeecg/components/MTreeSelect.vue';
-// import ApiSelect from '/@/components/Form/src/components/ApiSelect.vue';
-import { nextTick } from 'vue';
-import { useMethods } from '/@/hooks/system/useMethods';
-import { useGo } from '/@/hooks/web/usePage';
-import { useGlobSetting } from '/@/hooks/setting';
-
-//瓦斯巡检查询参数
-const addressData = ref(''); //巡检地点
-const personData = ref(''); //巡检员
-const instypeData = ref(''); //巡检类型
-const classData = ref(''); //巡检班次
-const gaspatrolData = ref<any[]>([]);
-const inspectJd = ref<any>('');
-const inspectList = reactive<any[]>([
-  { label: '第一次巡检已检数', val: 0 },
-  { label: '第一次巡检未检数', val: 0 },
-  { label: '第二次巡检已检数', val: 0 },
-  { label: '第二次巡检未检数', val: 0 },
-]);
-
-const glob = useGlobSetting();
-// import { BorderBox8 as DvBorderBox8 } from '@kjgl77/datav-vue3';
-
-const { FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal, WisdomBallModal } = getMonitorComponent();
-type DeviceType = { deviceType: string; deviceName: string; datalist: any[] };
-
-const props = defineProps({
-  pageData: {
-    type: Object,
-    default: () => {},
-  },
-});
-const { handleExportXls } = useMethods();
-const go = useGo();
-const echatsOption = {
-  grid: {
-    top: '35',
-    left: '30',
-    right: '45',
-    bottom: '25',
-    containLabel: true,
-  },
-  toolbox: {
-    feature: {},
-  },
-};
-const router = useRouter();
-
-const actions = getActions();
-// actions.setGlobalState({ pageObj: { pageType: 'home' } });
-const locationForm = reactive({
-  strname: '',
-  department: '',
-  stationname: '',
-});
-
-const safetymonitorForm = reactive({
-  dataTypeName: '',
-  strinstallpos: '',
-});
-
-const monitorTable = ref();
-const historyTable = ref();
-const alarmHistoryTable = ref();
-const handlerHistoryTable = ref();
-
-// const routerParam = ref('home') // 默认进来时首页
-const isRefresh = ref(true);
-// 模态框
-const currentModal = shallowRef<Nullable<ComponentOptions>>(null); //模态框
-const modalVisible = ref<Boolean>(false); // 模态框是否可见
-
-// const drawerHeight = ref(240) // 监测框最小高度
-const treeShow = ref(true); //是否显示树形菜单
-const tableShow = ref(true); //是否显示树形菜单
-const locationSettingShow = ref(false); //是否显示树形菜单
-const treeNodeTitle = ref(''); // 选中的树形标题
-
-const locationList = ref([]); //巷道定位图标显示列表
-const deviceList = ref<DeviceType[]>([]); //关联设备列表
-const deviceActive = ref('');
-const activeKey = ref('1'); // tab key
-const dataSource = shallowRef([]); // 实时监测数据
-const majorPathEchartsData = ref({}); // 关键路线echarts数据
-const surfaceEchartsData = ref<any[]>(); // 工作面历史记录,echarts数据
-const activeID = ref(''); // 打开详情modal时监测的设备id
-const deviceType = ref(''); // 监测设备类型
-const systemType = ref('');
-const systemID = ref(''); // 系统监测时,系统id
-const selectedKeys = ref<string[]>([]);
-const expandedKeys = ref<string[]>([]);
-const scroll = reactive({
-  y: 180,
-});
-const treeData = ref<TreeProps['treeData']>([]);
-let departmentInfo: Null | Object = null;
-let startMonitorTimer = 0;
-
-//树形菜单选择事件
-const onSelect: TreeProps['onSelect'] = (keys, e) => {
-  deviceType.value = '';
-  systemID.value = '';
-  deviceList.value = [];
-  const title = e.node.title; // 在
-  if (e.node.parent && e.node.parent.node.type.toString().startsWith('sys')) {
-    systemType.value = e.node.parent.node.type;
-    if (deviceType.value != e.node.parent.node.type) deviceType.value = e.node.parent.node.type;
-    systemID.value = e.node.type;
-    // 传递工作面id信息,用于定位
-    go(`/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=${deviceType.value}&deviceid=${systemID.value}`);
-  } else {
-    systemType.value = e.node.type;
-    if (deviceType.value != e.node.type) deviceType.value = e.node.type;
-    go(`/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=${deviceType.value}&deviceid=`);
-  }
-  clearTimeout(timer);
-  timer = undefined;
-  if (startMonitorTimer) {
-    clearTimeout(startMonitorTimer);
-  }
-  dataSource.value = [];
-  if (!startMonitorTimer) {
-    startMonitorTimer = setTimeout(() => {
-      expandedKeys.value = keys;
-      selectedKeys.value = keys;
-      treeNodeTitle.value = e.node.title;
-
-      if (e.node.children?.length < 1 && timer) {
-        getMonitor(true);
-      }
-    }, 1000);
-  }
-  // activeKey.value = '1';
-};
-
-function tabChange(activeKeyVal) {
-  activeKey.value = activeKeyVal;
-}
-
-function showTree(flag, value) {
-  if (flag == 'treeShow') treeShow.value = value;
-  if (flag == 'location') locationSettingShow.value = value;
-}
-
-async function getDeviceType(sysType?) {
-  if (treeData.value?.length > 0) return;
-  const result = await getDeviceTypeList({});
-  if (result.length > 0) {
-    debugger;
-    const dataSource = <TreeProps['treeData']>[];
-    let key = '0';
-    const getData = (resultList, dataSourceList, keyVal) => {
-      resultList.forEach((item, index) => {
-        if (item.deviceType != 'sys' && item.children && item.children.length > 0) {
-          const children = getData(item.children, [], `${keyVal}-${index}`);
-          // 判断关键阻力路线
-          if (item.itemValue.startsWith(sysType) && children[0]) {
-            systemID.value = item.children[0]['itemValue'];
-          }
+  import { ref, onMounted, onUnmounted, ComponentOptions, shallowRef, reactive, defineProps, watch } from 'vue';
+  import { SendOutlined, FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons-vue';
+  import {
+    list,
+    getDeviceList,
+    getDeviceTypeList,
+    devPosition,
+    getDepartmentInfo,
+    getExportUrl,
+    queryNowGasInsInfo,
+    queryNowGasSta,
+  } from './device.api';
+  import AlarmHistoryTable from '../../../comment/AlarmHistoryTable.vue';
+  import HistoryTable from '../../../comment/HistoryTable.vue';
+  import HandlerHistoryTable from '../../../comment/HandlerHistoryTable.vue';
+  import MonitorTable from '../../../comment/MonitorTable.vue';
+  import GroupMonitorTable from '../../../comment/GroupMonitorTable.vue';
+  import gaspatrolTable from '../../../comment/gaspatrolTable.vue';
+  import dustMonitorTable from '../../../comment/dustMonitorTable.vue';
+  import bundleMonitorTable from '../../../comment/bundleMonitorTable.vue';
+  import DustingTable from '../../../comment/DustingTable.vue';
+  import bundleSpyMonitorTable from '../../../comment/bundleSpyMonitorTable.vue';
+  import HistoryBall from './modal/history-ball.vue';
+  import { TreeProps, message, Progress, Input, Select } from 'ant-design-vue';
+  import { TableAction } from '/@/components/Table';
+  import { SvgIcon } from '/@/components/Icon';
+  import { getActions } from '/@/qiankun/state';
+  import { useRouter } from 'vue-router';
+  import { setDivHeight } from '/@/utils/event';
+  import {
+    majorColumns,
+    haveSysDetailArr,
+    haveDetailArr,
+    haveHandlerArr,
+    noWarningArr,
+    surfaceChartsColumns,
+    noHistoryArr,
+    getMonitorComponent,
+    vehicleFormConfig,
+  } from './device.data';
+  import mainPath from './modal/mainPath.vue';
+  import { formConfig } from '../../../safetyMonitor/safety.data';
+  import { getDictItemsByCode } from '/@/utils/dict';
+  import BarAndLine from '/@/components/chart/BarAndLine.vue';
+  import MTreeSelect from '/@/components/Form/src/jeecg/components/MTreeSelect.vue';
+  // import ApiSelect from '/@/components/Form/src/components/ApiSelect.vue';
+  import { nextTick } from 'vue';
+  import { useMethods } from '/@/hooks/system/useMethods';
+  import { useGo } from '/@/hooks/web/usePage';
+  import { useGlobSetting } from '/@/hooks/setting';
+
+  //瓦斯巡检查询参数
+  const addressData = ref(''); //巡检地点
+  const personData = ref(''); //巡检员
+  const instypeData = ref(''); //巡检类型
+  const classData = ref(''); //巡检班次
+  const gaspatrolData = ref<any[]>([]);
+  const inspectJd = ref<any>('');
+  const inspectList = reactive<any[]>([
+    { label: '第一次巡检已检数', val: 0 },
+    { label: '第一次巡检未检数', val: 0 },
+    { label: '第二次巡检已检数', val: 0 },
+    { label: '第二次巡检未检数', val: 0 },
+  ]);
+
+  const glob = useGlobSetting();
+  // import { BorderBox8 as DvBorderBox8 } from '@kjgl77/datav-vue3';
+
+  const { FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal, WisdomBallModal } = getMonitorComponent();
+  type DeviceType = { deviceType: string; deviceName: string; datalist: any[] };
+
+  const props = defineProps({
+    pageData: {
+      type: Object,
+      default: () => {},
+    },
+  });
+  const { handleExportXls } = useMethods();
+  const go = useGo();
+  const echatsOption = {
+    grid: {
+      top: '35',
+      left: '30',
+      right: '45',
+      bottom: '25',
+      containLabel: true,
+    },
+    toolbox: {
+      feature: {},
+    },
+  };
+  const router = useRouter();
+
+  const actions = getActions();
+  // actions.setGlobalState({ pageObj: { pageType: 'home' } });
+  const locationForm = reactive({
+    strname: '',
+    department: '',
+    stationname: '',
+  });
 
-          dataSourceList.push({
-            children: children,
-            title: item.itemText,
-            key: `${keyVal}-${index}`,
-            type: item.itemValue,
-            parentKey: `${keyVal}`,
-          });
-        } else {
-          dataSourceList.push({
-            children: [],
-            title: item.itemText,
-            key: `${keyVal}-${index}`,
-            type: item.itemValue,
-            parentKey: `${keyVal}`,
-          });
+  const safetymonitorForm = reactive({
+    dataTypeName: '',
+    strinstallpos: '',
+  });
+
+  const monitorTable = ref();
+  const historyTable = ref();
+  const alarmHistoryTable = ref();
+  const handlerHistoryTable = ref();
+
+  // const routerParam = ref('home') // 默认进来时首页
+  const isRefresh = ref(true);
+  // 模态框
+  const currentModal = shallowRef<Nullable<ComponentOptions>>(null); //模态框
+  const modalVisible = ref<Boolean>(false); // 模态框是否可见
+
+  // const drawerHeight = ref(240) // 监测框最小高度
+  const treeShow = ref(true); //是否显示树形菜单
+  const tableShow = ref(true); //是否显示树形菜单
+  const locationSettingShow = ref(false); //是否显示树形菜单
+  const treeNodeTitle = ref(''); // 选中的树形标题
+
+  const locationList = ref([]); //巷道定位图标显示列表
+  const deviceList = ref<DeviceType[]>([]); //关联设备列表
+  const deviceActive = ref('');
+  const activeKey = ref('1'); // tab key
+  const dataSource = shallowRef([]); // 实时监测数据
+  const majorPathEchartsData = ref({}); // 关键路线echarts数据
+  const surfaceEchartsData = ref<any[]>(); // 工作面历史记录,echarts数据
+  const activeID = ref(''); // 打开详情modal时监测的设备id
+  const deviceType = ref(''); // 监测设备类型
+  const systemType = ref('');
+  const systemID = ref(''); // 系统监测时,系统id
+  const selectedKeys = ref<string[]>([]);
+  const expandedKeys = ref<string[]>([]);
+  const scroll = reactive({
+    y: 180,
+  });
+  const treeData = ref<TreeProps['treeData']>([]);
+  let departmentInfo: Null | Object = null;
+  let startMonitorTimer = 0;
+
+  //树形菜单选择事件
+  const onSelect: TreeProps['onSelect'] = (keys, e) => {
+    deviceType.value = '';
+    systemID.value = '';
+    deviceList.value = [];
+    const title = e.node.title; // 在
+    if (e.node.parent && e.node.parent.node.type.toString().startsWith('sys')) {
+      systemType.value = e.node.parent.node.type;
+      if (deviceType.value != e.node.parent.node.type) deviceType.value = e.node.parent.node.type;
+      systemID.value = e.node.type;
+      // 传递工作面id信息,用于定位
+      go(`/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=${deviceType.value}&deviceid=${systemID.value}`);
+    } else {
+      systemType.value = e.node.type;
+      if (deviceType.value != e.node.type) deviceType.value = e.node.type;
+      go(`/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=${deviceType.value}&deviceid=`);
+    }
+    clearTimeout(timer);
+    timer = undefined;
+    if (startMonitorTimer) {
+      clearTimeout(startMonitorTimer);
+    }
+    dataSource.value = [];
+    if (!startMonitorTimer) {
+      startMonitorTimer = setTimeout(() => {
+        expandedKeys.value = keys;
+        selectedKeys.value = keys;
+        treeNodeTitle.value = e.node.title;
+
+        if (e.node.children?.length < 1 && timer) {
+          getMonitor(true);
         }
-      });
-      return dataSourceList;
-    };
-    treeData.value = getData(result, dataSource, key);
+      }, 1000);
+    }
+    // activeKey.value = '1';
+  };
+
+  function tabChange(activeKeyVal) {
+    activeKey.value = activeKeyVal;
   }
-}
-
-// https获取监测数据
-let timer: null | NodeJS.Timeout = undefined;
-function getMonitor(flag?) {
-  if (deviceType.value) {
-    if (timer) timer = null;
-    if (Object.prototype.toString.call(timer) === '[object Null]') {
-      timer = setTimeout(
-        async () => {
-          if (!deviceType.value.startsWith('gasDayReport')) {
-            await getDataSource();
+
+  function showTree(flag, value) {
+    if (flag == 'treeShow') treeShow.value = value;
+    if (flag == 'location') locationSettingShow.value = value;
+  }
+
+  async function getDeviceType(sysType?) {
+    if (treeData.value?.length > 0) return;
+    const result = await getDeviceTypeList({});
+    if (result.length > 0) {
+      debugger;
+      const dataSource = <TreeProps['treeData']>[];
+      let key = '0';
+      const getData = (resultList, dataSourceList, keyVal) => {
+        resultList.forEach((item, index) => {
+          if (item.deviceType != 'sys' && item.children && item.children.length > 0) {
+            const children = getData(item.children, [], `${keyVal}-${index}`);
+            // 判断关键阻力路线
+            if (item.itemValue.startsWith(sysType) && children[0]) {
+              systemID.value = item.children[0]['itemValue'];
+            }
+
+            dataSourceList.push({
+              children: children,
+              title: item.itemText,
+              key: `${keyVal}-${index}`,
+              type: item.itemValue,
+              parentKey: `${keyVal}`,
+            });
           } else {
-            await queryNowGasInsInfoList();
-          }
-          if (timer) {
-            getMonitor();
+            dataSourceList.push({
+              children: [],
+              title: item.itemText,
+              key: `${keyVal}-${index}`,
+              type: item.itemValue,
+              parentKey: `${keyVal}`,
+            });
           }
-        },
-        flag ? 0 : 1000
-      );
+        });
+        return dataSourceList;
+      };
+      treeData.value = getData(result, dataSource, key);
     }
   }
-}
-
-async function getDataSource() {
-  if (deviceType.value && deviceType.value.startsWith('sys') && systemID.value) {
-    const res = await list({ devicetype: 'sys', systemID: systemID.value });
-    const result = res.msgTxt;
-    const deviceArr = <DeviceType[]>[];
-    result.forEach((item) => {
-      const data = item['datalist'].filter((data: any) => {
-        const readData = data.readData;
-        return Object.assign(data, readData);
-      });
-      if (item.type != 'sys') {
-        if (item.type === 'majorpath') {
-          deviceArr.unshift({ deviceType: item.type, deviceName: item['typeName'], datalist: item['datalist'][0]['paths'] });
-          majorPathEchartsData.value = item['datalist'][0];
-        } else if (item.type.startsWith('surface_history')) {
-          surfaceEchartsData.value = item['datalist'][0];
-          deviceArr.unshift({
-            deviceType: item.type,
-            deviceName: item['typeName'] ? item['typeName'] : item['datalist'][0]['typeName'],
-            datalist: data,
-          });
-        } else {
-          deviceArr.unshift({
-            deviceType: item.type,
-            deviceName: item['typeName'] ? item['typeName'] : item['datalist'][0]['typeName'],
-            datalist: data,
-          });
-        }
-      }
-    });
 
-    deviceList.value = deviceArr;
-    if (deviceArr.length > 0) {
-      // if (deviceArr[1]) {
-      //   deviceActive.value = deviceArr[1].deviceType
-      //   monitorChange(1)
-      // } else {
-      //   deviceActive.value = deviceArr[0].deviceType
-      //   monitorChange(0)
-      // }
-      deviceActive.value = deviceArr[0].deviceType;
-      monitorChange(0);
-    }
-  } else {
-    let res = null;
-    if (systemID.value) {
-      res = await list({ devicetype: 'sys', types: deviceType.value, systemID: systemID.value });
-      if (res && res.msgTxt) {
-        const result = res.msgTxt;
-        result.forEach((item) => {
-          const data = item['datalist'].filter((data: any) => {
-            const readData = data.readData;
-            return Object.assign(data, readData);
-          });
-          if (item.type != 'sys') {
-            if (item.type.startsWith('majorpath') && item.type == deviceType.value) {
-              dataSource.value = item['datalist'][0]['paths'];
-              majorPathEchartsData.value = item['datalist'][0];
-              return;
-            } else if (item.type == deviceType.value) {
-              if (item.type == 'surface_history') {
-                // 工作面图标数据
-                surfaceEchartsData.value = item['datalist'][0];
-              } else {
-                dataSource.value = data;
-                console.log('关联设备数据--------------->', data);
-              }
-              return;
+  // https获取监测数据
+  let timer: null | NodeJS.Timeout = undefined;
+  function getMonitor(flag?) {
+    if (deviceType.value) {
+      if (timer) timer = null;
+      if (Object.prototype.toString.call(timer) === '[object Null]') {
+        timer = setTimeout(
+          async () => {
+            if (!deviceType.value.startsWith('gasDayReport')) {
+              await getDataSource();
+            } else {
+              await queryNowGasInsInfoList();
             }
-          }
-        });
-      }
-    } else {
-      let resultData, searchForm;
-      if (monitorTable.value) {
-        const formData = monitorTable.value.getForm();
-        searchForm = formData.getFieldsValue();
+            if (timer) {
+              getMonitor();
+            }
+          },
+          flag ? 0 : 1000
+        );
       }
+    }
+  }
 
-      if (monitorTable.value) {
-        if (deviceType.value.startsWith('safetymonitor')) {
-          resultData = await list({ devicetype: deviceType.value, pagetype: 'normal', filterParams: { ...searchForm } });
-        } else if (deviceType.value.startsWith('location')) {
-          if (!departmentInfo) {
-            departmentInfo = await getDepartmentInfo({});
+  async function getDataSource() {
+    if (deviceType.value && deviceType.value.startsWith('sys') && systemID.value) {
+      const res = await list({ devicetype: 'sys', systemID: systemID.value });
+      const result = res.msgTxt;
+      const deviceArr = <DeviceType[]>[];
+      result.forEach((item) => {
+        const data = item['datalist'].filter((data: any) => {
+          const readData = data.readData;
+          return Object.assign(data, readData);
+        });
+        if (item.type != 'sys') {
+          if (item.type === 'majorpath') {
+            deviceArr.unshift({ deviceType: item.type, deviceName: item['typeName'], datalist: item['datalist'][0]['paths'] });
+            majorPathEchartsData.value = item['datalist'][0];
+          } else if (item.type.startsWith('surface_history')) {
+            surfaceEchartsData.value = item['datalist'][0];
+            deviceArr.unshift({
+              deviceType: item.type,
+              deviceName: item['typeName'] ? item['typeName'] : item['datalist'][0]['typeName'],
+              datalist: data,
+            });
+          } else {
+            deviceArr.unshift({
+              deviceType: item.type,
+              deviceName: item['typeName'] ? item['typeName'] : item['datalist'][0]['typeName'],
+              datalist: data,
+            });
           }
-          let department = null;
-          if (departmentInfo && locationForm && locationForm['department']) {
-            for (const key in departmentInfo) {
-              const item = departmentInfo[key];
-              if (item['id'] === locationForm['department']) {
-                department = item;
-                break;
+        }
+      });
+
+      deviceList.value = deviceArr;
+      if (deviceArr.length > 0) {
+        // if (deviceArr[1]) {
+        //   deviceActive.value = deviceArr[1].deviceType
+        //   monitorChange(1)
+        // } else {
+        //   deviceActive.value = deviceArr[0].deviceType
+        //   monitorChange(0)
+        // }
+        deviceActive.value = deviceArr[0].deviceType;
+        monitorChange(0);
+      }
+    } else {
+      let res = null;
+      if (systemID.value) {
+        res = await list({ devicetype: 'sys', types: deviceType.value, systemID: systemID.value });
+        if (res && res.msgTxt) {
+          const result = res.msgTxt;
+          result.forEach((item) => {
+            const data = item['datalist'].filter((data: any) => {
+              const readData = data.readData;
+              return Object.assign(data, readData);
+            });
+            if (item.type != 'sys') {
+              if (item.type.startsWith('majorpath') && item.type == deviceType.value) {
+                dataSource.value = item['datalist'][0]['paths'];
+                majorPathEchartsData.value = item['datalist'][0];
+                return;
+              } else if (item.type == deviceType.value) {
+                if (item.type == 'surface_history') {
+                  // 工作面图标数据
+                  surfaceEchartsData.value = item['datalist'][0];
+                } else {
+                  dataSource.value = data;
+                  console.log('关联设备数据--------------->', data);
+                }
+                return;
               }
             }
-          }
-          resultData = await list({
-            devicetype: deviceType.value,
-            pagetype: 'normal',
-            filterParams: {
-              strinstallpos: locationForm['stationname'] ? locationForm['stationname'] : '',
-              userName: locationForm['strname'] ? locationForm['strname'] : '',
-              userJson: department && department['name'] ? department['name'] : '',
-            },
           });
-        } else if (deviceType.value.startsWith('vehicle')) {
-          resultData = await list({
-            devicetype: deviceType.value,
-            pagetype: 'normal',
-            filterParams: {
-              strinstallpos: locationForm['stationname'] ? locationForm['stationname'] : '',
-              vehicleName: locationForm['strname'] ? locationForm['strname'] : '',
-            },
-          });
-        } else {
-          resultData = await list({ devicetype: deviceType.value, pagetype: 'normal' });
         }
       } else {
-        // 非安全监控
-        resultData = await list({ devicetype: deviceType.value, pagetype: 'normal' });
-      }
-      if (resultData && resultData.msgTxt) {
-        const result = resultData.msgTxt[0];
-        if (result) {
-          const data = result['datalist'].filter((data: any) => {
-            const readData = data.readData;
-            return Object.assign(data, readData);
-          });
+        let resultData, searchForm;
+        if (monitorTable.value) {
+          const formData = monitorTable.value.getForm();
+          searchForm = formData.getFieldsValue();
+        }
+
+        if (monitorTable.value) {
           if (deviceType.value.startsWith('safetymonitor')) {
-            const resultData = <any[]>[];
-            // 如果是安全监控的数据时需要过滤常见设备数据,根据设定的常用安全监控字典去匹配
-            const dictCodes = getDictItemsByCode('safetynormal');
-            if (searchForm && !searchForm['dataTypeName'] && dictCodes && dictCodes.length) {
-              for (let i = 0; i < dictCodes.length; i++) {
-                const dict = dictCodes[i];
-                data.forEach((item) => {
-                  if (dict['value'] == item['dataTypeName']) {
-                    resultData.push(item);
-                  }
-                });
+            resultData = await list({ devicetype: deviceType.value, pagetype: 'normal', filterParams: { ...searchForm } });
+          } else if (deviceType.value.startsWith('location')) {
+            if (!departmentInfo) {
+              departmentInfo = await getDepartmentInfo({});
+            }
+            let department = null;
+            if (departmentInfo && locationForm && locationForm['department']) {
+              for (const key in departmentInfo) {
+                const item = departmentInfo[key];
+                if (item['id'] === locationForm['department']) {
+                  department = item;
+                  break;
+                }
               }
-              dataSource.value = resultData;
-            } else {
-              dataSource.value = data;
             }
+            resultData = await list({
+              devicetype: deviceType.value,
+              pagetype: 'normal',
+              filterParams: {
+                strinstallpos: locationForm['stationname'] ? locationForm['stationname'] : '',
+                userName: locationForm['strname'] ? locationForm['strname'] : '',
+                userJson: department && department['name'] ? department['name'] : '',
+              },
+            });
+          } else if (deviceType.value.startsWith('vehicle')) {
+            resultData = await list({
+              devicetype: deviceType.value,
+              pagetype: 'normal',
+              filterParams: {
+                strinstallpos: locationForm['stationname'] ? locationForm['stationname'] : '',
+                vehicleName: locationForm['strname'] ? locationForm['strname'] : '',
+              },
+            });
           } else {
-            let tableData: any[] = [];
-            let noNetData: any[] = [];
-            data.filter((el) => {
-              if (el.netStatus == 1) {
-                tableData.push(el);
+            resultData = await list({ devicetype: deviceType.value, pagetype: 'normal' });
+          }
+        } else {
+          // 非安全监控
+          resultData = await list({ devicetype: deviceType.value, pagetype: 'normal' });
+        }
+        if (resultData && resultData.msgTxt) {
+          const result = resultData.msgTxt[0];
+          if (result) {
+            const data = result['datalist'].filter((data: any) => {
+              const readData = data.readData;
+              return Object.assign(data, readData);
+            });
+            if (deviceType.value.startsWith('safetymonitor')) {
+              const resultData = <any[]>[];
+              // 如果是安全监控的数据时需要过滤常见设备数据,根据设定的常用安全监控字典去匹配
+              const dictCodes = getDictItemsByCode('safetynormal');
+              if (searchForm && !searchForm['dataTypeName'] && dictCodes && dictCodes.length) {
+                for (let i = 0; i < dictCodes.length; i++) {
+                  const dict = dictCodes[i];
+                  data.forEach((item) => {
+                    if (dict['value'] == item['dataTypeName']) {
+                      resultData.push(item);
+                    }
+                  });
+                }
+                dataSource.value = resultData;
               } else {
-                noNetData.push(el);
+                dataSource.value = data;
               }
-            });
-            dataSource.value = [...tableData, ...noNetData];
+            } else {
+              let tableData: any[] = [];
+              let noNetData: any[] = [];
+              data.filter((el) => {
+                if (el.netStatus == 1) {
+                  tableData.push(el);
+                } else {
+                  noNetData.push(el);
+                }
+              });
+              dataSource.value = [...tableData, ...noNetData];
+            }
+          } else {
+            dataSource.value = [];
           }
         } else {
           dataSource.value = [];
         }
-      } else {
-        dataSource.value = [];
       }
     }
   }
-}
-
-function goLocation(record) {
-  if (record['deviceType'] == 'person_bd' || record['deviceType'] == 'car_bd') {
-    actions.setGlobalState({ locationId: record.devNum, locationObj: null, pageObj: null, type: record['deviceType'].split('_')[0] });
-  } else {
-    if (deviceType.value.startsWith('location')) {
-      actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null, type: 'person' });
-    } else if (deviceType.value.startsWith('vehicle')) {
-      actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null, type: 'car' });
+
+  function goLocation(record) {
+    if (record['deviceType'] == 'person_bd' || record['deviceType'] == 'car_bd') {
+      actions.setGlobalState({ locationId: record.devNum, locationObj: null, pageObj: null, type: record['deviceType'].split('_')[0] });
     } else {
-      actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null });
-    }
-  }
-}
-
-//查询当前各班瓦斯巡检信息
-async function queryNowGasInsInfoList() {
-  let res = await queryNowGasInsInfo({ address: addressData.value, userName: personData.value, insType: instypeData.value, class: classData.value });
-  console.log(res, '查询当前各班瓦斯巡检信息');
-  if (res.length) {
-    gaspatrolData.value = res;
-  } else {
-    gaspatrolData.value = [];
-  }
-}
-//巡检地点输入
-let addressInput = (param) => {
-  addressData.value = param;
-};
-//巡检员输入
-let userInput = (param) => {
-  personData.value = param;
-};
-//巡检类型选项切换
-let insTypeChange = (param) => {
-  instypeData.value = param;
-};
-//巡检班次选项切换
-let classChange = (param) => {
-  classData.value = param;
-};
-//查询巡检弹窗信息
-async function getSearch() {
-  if (!instypeData.value) {
-    message.warning('请选择巡检类型!');
-  } else if (!classData.value) {
-    message.warning('请选择巡检班次!');
-  } else {
-    let res = await queryNowGasSta({ insType: instypeData.value, class: classData.value });
-    console.log(res, '巡检弹窗信息');
-    if (res) {
-      inspectJd.value = res.comRate || 0;
-      inspectList[0].val = res.finishNum1 || 0;
-      inspectList[1].val = res.missNum1 || 0;
-      inspectList[2].val = res.finishNum2 || 0;
-      inspectList[3].val = res.missNum2 || 0;
+      if (deviceType.value.startsWith('location')) {
+        actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null, type: 'person' });
+      } else if (deviceType.value.startsWith('vehicle')) {
+        actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null, type: 'car' });
+      } else {
+        actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null });
+      }
     }
   }
-}
-
-function goDetail(record?) {
-  debugger;
-  if (record) {
-    activeID.value = record.deviceID;
-    if (deviceType.value.startsWith('fiber')) {
-      currentModal.value = FiberModal;
-      modalVisible.value = true;
-    } else if (deviceType.value.startsWith('dusting')) {
-      currentModal.value = DustModal;
-      modalVisible.value = true;
-    } else if (deviceType.value.startsWith('bundletube')) {
-      currentModal.value = BundleModal;
-      modalVisible.value = true;
-    } else if (deviceType.value.startsWith('firemon_normal')) {
-      // currentModal.value = BundleModal;
-      currentModal.value = WisdomBallModal;
-      modalVisible.value = true;
-    } else if (deviceType.value.startsWith('ballvalve')) {
-      currentModal.value = BallvalveModal;
-      modalVisible.value = true;
-    } else if (deviceType.value.startsWith('atomizing')) {
-      currentModal.value = AtomizingModal;
-      modalVisible.value = true;
-    } else if (deviceType.value.startsWith('gaspatrol')) {
-      currentModal.value = GaspatrolModal;
-      modalVisible.value = true;
-    } else if (deviceType.value.indexOf('gate') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-gate', query: { id: activeID.value, deviceType: deviceType.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('window') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-window', query: { id: activeID.value, deviceType: deviceType.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('windrect') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-windrect', query: { id: activeID.value, deviceType: deviceType.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('fanmain') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-fanmain', query: { id: activeID.value, deviceType: deviceType.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('fanlocal') != -1 && glob.sysOrgCode !== 'ymdnymdn') {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal', query: { id: activeID.value, deviceType: deviceType.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('fanlocal') != -1 && glob.sysOrgCode == 'ymdnymdn') {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal1', query: { id: activeID.value, deviceType: record.deviceType } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('pulping') != -1) {
-      const newPage = router.resolve({ path: '/grout-home', query: { id: activeID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('pressurefan') != -1) {
-      const newPage = router.resolve({ path: '/nitrogen/home', query: { id: activeID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('chamber') != -1) {
-      const newPage = router.resolve({ path: '/chamber-home', query: { id: activeID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('safetymonitor') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/device-monitor/safetymonitor', query: { id: activeID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('pump') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/gasPump-home', query: { id: activeID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (systemType.value.indexOf('nitrogen') != -1) {
-      const newPage = router.resolve({ path: '/nitrogen-home', query: { id: systemID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('forcFan') != -1) {
-      const newPage = router.resolve({ path: '/forcFan/home', query: { id: activeID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('pulping') != -1) {
-      const newPage = router.resolve({ path: '/grout-home', query: { id: activeID.value } });
-      window.open(newPage.href, '_blank');
+
+  //查询当前各班瓦斯巡检信息
+  async function queryNowGasInsInfoList() {
+    let res = await queryNowGasInsInfo({
+      address: addressData.value,
+      userName: personData.value,
+      insType: instypeData.value,
+      class: classData.value,
+    });
+    console.log(res, '查询当前各班瓦斯巡检信息');
+    if (res.length) {
+      gaspatrolData.value = res;
     } else {
-      message.info('待开发。。。');
+      gaspatrolData.value = [];
     }
-  } else {
-    if (systemType.value.indexOf('sys_dongshi') != -1) {
-      const newPage = router.resolve({ path: '/chamber-home', query: { id: systemID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (systemType.value.indexOf('sys_obfurage') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/obfurage-home', query: { id: systemID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (systemType.value.indexOf('sys_surface_caimei') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/wokerFace-home', query: { id: systemID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (systemType.value.indexOf('sys_surface_juejin') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/tunFace-home', query: { id: systemID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (systemType.value.indexOf('sys_maintunnel_leather') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/beltTun-home', query: { id: systemID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (systemType.value.indexOf('sys_surface_junya') != -1) {
-      const newPage = router.resolve({ path: '/monitorChannel/balancePress-home', query: { id: systemID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (systemType.value.indexOf('sys_nitrogen') != -1) {
-      const newPage = router.resolve({ path: '/nitrogen-home', query: { id: systemID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('forcFan') != -1) {
-      const newPage = router.resolve({ path: '/forcFan/home', query: { id: activeID.value } });
-      window.open(newPage.href, '_blank');
-    } else if (deviceType.value.indexOf('pulping') != -1) {
-      const newPage = router.resolve({ path: '/grout-home', query: { id: systemID.value } });
-      window.open(newPage.href, '_blank');
+  }
+  //巡检地点输入
+  let addressInput = (param) => {
+    addressData.value = param;
+  };
+  //巡检员输入
+  let userInput = (param) => {
+    personData.value = param;
+  };
+  //巡检类型选项切换
+  let insTypeChange = (param) => {
+    instypeData.value = param;
+  };
+  //巡检班次选项切换
+  let classChange = (param) => {
+    classData.value = param;
+  };
+  //查询巡检弹窗信息
+  async function getSearch() {
+    if (!instypeData.value) {
+      message.warning('请选择巡检类型!');
+    } else if (!classData.value) {
+      message.warning('请选择巡检班次!');
     } else {
-      message.info('待开发。。。');
+      let res = await queryNowGasSta({ insType: instypeData.value, class: classData.value });
+      console.log(res, '巡检弹窗信息');
+      if (res) {
+        inspectJd.value = res.comRate || 0;
+        inspectList[0].val = res.finishNum1 || 0;
+        inspectList[1].val = res.missNum1 || 0;
+        inspectList[2].val = res.finishNum2 || 0;
+        inspectList[3].val = res.missNum2 || 0;
+      }
     }
   }
-}
-function goGasDayReport() {
-  const newPage = router.resolve({ path: '/gas/gas-report/home' });
-  window.open(newPage.href, '_blank');
-}
-function goDustDayReport() {
-  const newPage = router.resolve({ path: '/dustDayReport/home' });
-  window.open(newPage.href, '_blank');
-}
-function goBundleDayReport() {
-  const newPage = router.resolve({ path: '/bundleDayReport/home' });
-  window.open(newPage.href, '_blank');
-}
-function goBundleSpyDayReport() {
-  const newPage = router.resolve({ path: '/bundleSpyDayReport/home' });
-  window.open(newPage.href, '_blank');
-}
-function exportXls() {
-  handleExportXls('瓦斯巡检记录', getExportUrl, { devicetype: deviceType.value });
-}
-
-function toHome() {
-  deviceList.value = [];
-  if (timer) clearTimeout(timer);
-  timer = undefined;
-  deviceType.value = '';
-  go(glob.homePath);
-}
-
-function toHide() {
-  tableShow.value = !tableShow.value;
-  document.getElementById('monitorBox').addEventListener('animationend', () => {
-    if (!tableShow.value) {
-      document.getElementById('monitorBox').style.height = '0px';
+
+  function goDetail(record?) {
+    debugger;
+    if (record) {
+      activeID.value = record.deviceID;
+      if (deviceType.value.startsWith('fiber')) {
+        currentModal.value = FiberModal;
+        modalVisible.value = true;
+      } else if (deviceType.value.startsWith('dusting')) {
+        currentModal.value = DustModal;
+        modalVisible.value = true;
+      } else if (deviceType.value.startsWith('bundletube')) {
+        currentModal.value = BundleModal;
+        modalVisible.value = true;
+      } else if (deviceType.value.startsWith('firemon_normal')) {
+        // currentModal.value = BundleModal;
+        currentModal.value = WisdomBallModal;
+        modalVisible.value = true;
+      } else if (deviceType.value.startsWith('ballvalve')) {
+        currentModal.value = BallvalveModal;
+        modalVisible.value = true;
+      } else if (deviceType.value.startsWith('atomizing')) {
+        currentModal.value = AtomizingModal;
+        modalVisible.value = true;
+      } else if (deviceType.value.startsWith('gaspatrol')) {
+        currentModal.value = GaspatrolModal;
+        modalVisible.value = true;
+      } else if (deviceType.value.indexOf('gate') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/monitor-gate', query: { id: activeID.value, deviceType: deviceType.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('window') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/monitor-window', query: { id: activeID.value, deviceType: deviceType.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('windrect') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/monitor-windrect', query: { id: activeID.value, deviceType: deviceType.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('fanmain') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/monitor-fanmain', query: { id: activeID.value, deviceType: deviceType.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('fanlocal') != -1 && glob.sysOrgCode !== 'ymdnymdn') {
+        const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal', query: { id: activeID.value, deviceType: deviceType.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('fanlocal') != -1 && glob.sysOrgCode == 'ymdnymdn') {
+        const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal1', query: { id: activeID.value, deviceType: record.deviceType } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('pulping') != -1) {
+        const newPage = router.resolve({ path: '/grout-home', query: { id: activeID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('pressurefan') != -1) {
+        const newPage = router.resolve({ path: '/nitrogen/home', query: { id: activeID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('chamber') != -1) {
+        const newPage = router.resolve({ path: '/chamber-home', query: { id: activeID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('safetymonitor') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/device-monitor/safetymonitor', query: { id: activeID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('pump') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/gasPump-home', query: { id: activeID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (systemType.value.indexOf('nitrogen') != -1) {
+        const newPage = router.resolve({ path: '/nitrogen-home', query: { id: systemID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('forcFan') != -1) {
+        const newPage = router.resolve({ path: '/forcFan/home', query: { id: activeID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('pulping') != -1) {
+        const newPage = router.resolve({ path: '/grout-home', query: { id: activeID.value } });
+        window.open(newPage.href, '_blank');
+      } else {
+        message.info('待开发。。。');
+      }
     } else {
-      document.getElementById('monitorBox').style.height = '290px';
+      if (systemType.value.indexOf('sys_dongshi') != -1) {
+        const newPage = router.resolve({ path: '/chamber-home', query: { id: systemID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (systemType.value.indexOf('sys_obfurage') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/obfurage-home', query: { id: systemID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (systemType.value.indexOf('sys_surface_caimei') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/wokerFace-home', query: { id: systemID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (systemType.value.indexOf('sys_surface_juejin') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/tunFace-home', query: { id: systemID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (systemType.value.indexOf('sys_maintunnel_leather') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/beltTun-home', query: { id: systemID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (systemType.value.indexOf('sys_surface_junya') != -1) {
+        const newPage = router.resolve({ path: '/monitorChannel/balancePress-home', query: { id: systemID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (systemType.value.indexOf('sys_nitrogen') != -1) {
+        const newPage = router.resolve({ path: '/nitrogen-home', query: { id: systemID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('forcFan') != -1) {
+        const newPage = router.resolve({ path: '/forcFan/home', query: { id: activeID.value } });
+        window.open(newPage.href, '_blank');
+      } else if (deviceType.value.indexOf('pulping') != -1) {
+        const newPage = router.resolve({ path: '/grout-home', query: { id: systemID.value } });
+        window.open(newPage.href, '_blank');
+      } else {
+        message.info('待开发。。。');
+      }
     }
-  });
-}
+  }
+  function goGasDayReport() {
+    const newPage = router.resolve({ path: '/gas/gas-report/home' });
+    window.open(newPage.href, '_blank');
+  }
+  function goDustDayReport() {
+    const newPage = router.resolve({ path: '/dustDayReport/home' });
+    window.open(newPage.href, '_blank');
+  }
+  function goBundleDayReport() {
+    const newPage = router.resolve({ path: '/bundleDayReport/home' });
+    window.open(newPage.href, '_blank');
+  }
+  function goBundleSpyDayReport() {
+    const newPage = router.resolve({ path: '/bundleSpyDayReport/home' });
+    window.open(newPage.href, '_blank');
+  }
+  function exportXls() {
+    handleExportXls('瓦斯巡检记录', getExportUrl, { devicetype: deviceType.value });
+  }
 
-async function findTreeDataValue(obj) {
-  const findDeviceType = (data: any[], obj, flag = true) => {
-    return data.find((item: any) => {
-      if (item.children.length > 0) {
-        findDeviceType(item.children, obj);
+  function toHome() {
+    deviceList.value = [];
+    if (timer) clearTimeout(timer);
+    timer = undefined;
+    deviceType.value = '';
+    go(glob.homePath);
+  }
+
+  function toHide() {
+    tableShow.value = !tableShow.value;
+    document.getElementById('monitorBox').addEventListener('animationend', () => {
+      if (!tableShow.value) {
+        document.getElementById('monitorBox').style.height = '0px';
+      } else {
+        document.getElementById('monitorBox').style.height = '290px';
       }
-      // debugger;
-      if (obj.deviceType && obj.deviceType.startsWith('sys_')) {
-        // debugger;
-        if (item.type == obj.deviceid) {
-          deviceType.value = 'sys';
-          systemID.value = obj.deviceid;
-          selectedKeys.value = [item.key];
-          expandedKeys.value = [item.key];
-          treeNodeTitle.value = item.title;
+    });
+  }
+
+  async function findTreeDataValue(obj) {
+    const findDeviceType = (data: any[], obj, flag = true) => {
+      return data.find((item: any) => {
+        if (item.children.length > 0) {
+          findDeviceType(item.children, obj);
         }
-      } else {
-        if (!flag) {
-          if (obj.deviceType && item.type.startsWith(obj.deviceType)) {
-            deviceType.value = item.type;
+        // debugger;
+        if (obj.deviceType && obj.deviceType.startsWith('sys_')) {
+          // debugger;
+          if (item.type == obj.deviceid) {
+            deviceType.value = 'sys';
+            systemID.value = obj.deviceid;
             selectedKeys.value = [item.key];
             expandedKeys.value = [item.key];
             treeNodeTitle.value = item.title;
-            return true;
           }
-          return false;
         } else {
-          if (obj.deviceType && item.type == obj.deviceType) {
-            deviceType.value = item.type;
-            selectedKeys.value = [item.key];
-            expandedKeys.value = [item.key];
-            treeNodeTitle.value = item.title;
-            return true;
+          if (!flag) {
+            if (obj.deviceType && item.type.startsWith(obj.deviceType)) {
+              deviceType.value = item.type;
+              selectedKeys.value = [item.key];
+              expandedKeys.value = [item.key];
+              treeNodeTitle.value = item.title;
+              return true;
+            }
+            return false;
+          } else {
+            if (obj.deviceType && item.type == obj.deviceType) {
+              deviceType.value = item.type;
+              selectedKeys.value = [item.key];
+              expandedKeys.value = [item.key];
+              treeNodeTitle.value = item.title;
+              return true;
+            }
+            return false;
           }
-          return false;
         }
-      }
-      return false;
-    });
-  };
-  const flag = findDeviceType(treeData.value, obj);
-  if (!flag) {
-    findDeviceType(treeData.value, obj, false);
-  }
-  // 无类型时
-  if (!treeNodeTitle.value && treeData.value && treeData.value[0] && treeData.value[0]['children']) {
-    const defaultData = treeData.value[0]['children'][0];
-    if (deviceType.value !== defaultData.type) deviceType.value = defaultData.type;
-    selectedKeys.value = [defaultData.key as string];
-    expandedKeys.value = [defaultData.key as string];
-    treeNodeTitle.value = defaultData.title;
-  }
+        return false;
+      });
+    };
+    const flag = findDeviceType(treeData.value, obj);
+    if (!flag) {
+      findDeviceType(treeData.value, obj, false);
+    }
+    // 无类型时
+    if (!treeNodeTitle.value && treeData.value && treeData.value[0] && treeData.value[0]['children']) {
+      const defaultData = treeData.value[0]['children'][0];
+      if (deviceType.value !== defaultData.type) deviceType.value = defaultData.type;
+      selectedKeys.value = [defaultData.key as string];
+      expandedKeys.value = [defaultData.key as string];
+      treeNodeTitle.value = defaultData.title;
+    }
 
-  if (timer === undefined) {
-    timer = null;
-    await getDataSource();
-    getMonitor(true);
-  }
-}
-
-function monitorChange(index) {
-  dataSource.value = [];
-  deviceActive.value = deviceList.value[index].deviceType;
-  if (deviceType.value != deviceActive.value) deviceType.value = deviceActive.value;
-  if (activeKey.value == '1' && monitorTable.value) {
-    monitorTable.value.setLoading(true);
-    dataSource.value = deviceList.value[index].datalist;
-  }
-  if (activeKey.value == '2' && historyTable.value) {
-    historyTable.value.setLoading(true);
-  }
-  if (activeKey.value == '3' && alarmHistoryTable.value) {
-    alarmHistoryTable.value.setLoading(true);
-  }
-  if (activeKey.value == '4' && handlerHistoryTable.value) {
-    handlerHistoryTable.value.setLoading(true);
+    if (timer === undefined) {
+      timer = null;
+      await getDataSource();
+      getMonitor(true);
+    }
   }
-}
-/**
- * 设置巷道设备定位图标的显示与隐藏
- */
-function setLocation() {
-  let locationStr = '';
-  locationList.value.forEach((item: any) => {
-    if (item.Visible) {
-      locationStr = locationStr ? locationStr + ',' + item.value : item.value;
+
+  function monitorChange(index) {
+    dataSource.value = [];
+    deviceActive.value = deviceList.value[index].deviceType;
+    if (deviceType.value != deviceActive.value) deviceType.value = deviceActive.value;
+    if (activeKey.value == '1' && monitorTable.value) {
+      monitorTable.value.setLoading(true);
+      dataSource.value = deviceList.value[index].datalist;
     }
-  });
-  actions.setGlobalState({ locationId: null, locationObj: null, pageObj: null, locationPlane: locationStr });
-  setTimeout(() => {
-    message.success('设置成功');
-  }, 600);
-}
-
-// function clearMonitor() {
-//   clearTimeout(timer);
-//   timer = undefined;
-//   if (startMonitorTimer) {
-//     clearTimeout(startMonitorTimer);
-//   }
-//   dataSource.value = [];
-//   startMonitorTimer = setTimeout(() => {
-//     expandedKeys.value = keys;
-//     selectedKeys.value = keys;
-//     treeNodeTitle.value = e.node.title;
-//     activeKey.value = '1';
-//     timer = null;
-//     if (e.node.children?.length < 1) {
-//       getMonitor(true);
-//     }
-//   }, 1000);
-// }show
-
-watch(
-  () => props.pageData,
-  async (pageObj) => {
-    isRefresh.value = false;
-    if (!treeData.value || treeData.value?.length < 1) {
-      await getDeviceType();
+    if (activeKey.value == '2' && historyTable.value) {
+      historyTable.value.setLoading(true);
     }
-    nextTick(() => {
-      isRefresh.value = true;
-      debugger;
-      // if (pageObj && pageObj.pageType && pageObj.pageType.startsWith('sys_')) {
-      //   findTreeDataValue({ deviceid: systemID.value });
-      // } else {
-      //   findTreeDataValue({ deviceType: pageObj.pageType });
-      // }
-      findTreeDataValue(pageObj);
+    if (activeKey.value == '3' && alarmHistoryTable.value) {
+      alarmHistoryTable.value.setLoading(true);
+    }
+    if (activeKey.value == '4' && handlerHistoryTable.value) {
+      handlerHistoryTable.value.setLoading(true);
+    }
+  }
+  /**
+   * 设置巷道设备定位图标的显示与隐藏
+   */
+  function setLocation() {
+    let locationStr = '';
+    locationList.value.forEach((item: any) => {
+      if (item.Visible) {
+        locationStr = locationStr ? locationStr + ',' + item.value : item.value;
+      }
     });
-  },
-  { immediate: true }
-);
-
-onMounted(async () => {
-  const pageObj = props.pageData;
-  if (!pageObj) return;
-  if (pageObj && pageObj.pageType) {
-    if (pageObj.pageType.startsWith('sys_')) {
-      await getDeviceType(pageObj.pageType);
-      findTreeDataValue({ deviceType: pageObj.pageType, deviceid: pageObj.deviceid });
+    actions.setGlobalState({ locationId: null, locationObj: null, pageObj: null, locationPlane: locationStr });
+    setTimeout(() => {
+      message.success('设置成功');
+    }, 600);
+  }
+
+  // function clearMonitor() {
+  //   clearTimeout(timer);
+  //   timer = undefined;
+  //   if (startMonitorTimer) {
+  //     clearTimeout(startMonitorTimer);
+  //   }
+  //   dataSource.value = [];
+  //   startMonitorTimer = setTimeout(() => {
+  //     expandedKeys.value = keys;
+  //     selectedKeys.value = keys;
+  //     treeNodeTitle.value = e.node.title;
+  //     activeKey.value = '1';
+  //     timer = null;
+  //     if (e.node.children?.length < 1) {
+  //       getMonitor(true);
+  //     }
+  //   }, 1000);
+  // }show
+
+  watch(
+    () => props.pageData,
+    async (pageObj) => {
+      isRefresh.value = false;
+      if (!treeData.value || treeData.value?.length < 1) {
+        await getDeviceType();
+      }
+      nextTick(() => {
+        isRefresh.value = true;
+        debugger;
+        // if (pageObj && pageObj.pageType && pageObj.pageType.startsWith('sys_')) {
+        //   findTreeDataValue({ deviceid: systemID.value });
+        // } else {
+        //   findTreeDataValue({ deviceType: pageObj.pageType });
+        // }
+        findTreeDataValue(pageObj);
+      });
+    },
+    { immediate: true }
+  );
+
+  onMounted(async () => {
+    const pageObj = props.pageData;
+    if (!pageObj) return;
+    if (pageObj && pageObj.pageType) {
+      if (pageObj.pageType.startsWith('sys_')) {
+        await getDeviceType(pageObj.pageType);
+        findTreeDataValue({ deviceType: pageObj.pageType, deviceid: pageObj.deviceid });
+      } else {
+        await getDeviceType();
+        findTreeDataValue({ deviceType: pageObj.pageType });
+      }
     } else {
       await getDeviceType();
-      findTreeDataValue({ deviceType: pageObj.pageType });
+      findTreeDataValue({ deviceid: pageObj.deviceid });
+    }
+    // 定位
+    const posShowData = pageObj.locationPlane;
+    if (posShowData) {
+      locationList.value = posShowData;
+    } else {
+      locationList.value = await devPosition({});
     }
-  } else {
-    await getDeviceType();
-    findTreeDataValue({ deviceid: pageObj.deviceid });
-  }
-  // 定位
-  const posShowData = pageObj.locationPlane;
-  if (posShowData) {
-    locationList.value = posShowData;
-  } else {
-    locationList.value = await devPosition({});
-  }
 
-  // safetyOption.value = await safetyDeviceList(null, { devicetype: 'safetymonitor', code: 'dataTypeName' })
-});
+    // safetyOption.value = await safetyDeviceList(null, { devicetype: 'safetymonitor', code: 'dataTypeName' })
+  });
 
-onUnmounted(() => {
-  if (timer) {
-    clearTimeout(timer);
-  }
-  timer = undefined;
-});
+  onUnmounted(() => {
+    if (timer) {
+      clearTimeout(timer);
+    }
+    timer = undefined;
+  });
 </script>
 
 <style lang="less" scoped>
-@import '/@/design/theme.less';
-@import '/@/design/vent/modal.less';
-@ventSpace: zxm;
+  @import '/@/design/theme.less';
+  @import '/@/design/vent/modal.less';
+  @ventSpace: zxm;
+
+  @{theme-deepblue} {
+    .scene-box {
+      // --image-modal-top: url('/@/assets/images/themify/deepblue/vent/home/modal-top.png');
+      // --image-tree-icon-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-icon-bg.png');
+      // --image-tree-icon-hover-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-icon-hover-bg.png');
+      // --image-tree-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-bg.png');
+      // --image-tree-expansion-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-expansion-bg.png');
+      // --image-tree-expansion-hover-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-expansion-hover-bg.png');
+      // --image-location-bg: url('/@/assets/images/themify/deepblue/vent/home/location-bg.png');
+      // --image-location-hover-bg: url('/@/assets/images/themify/deepblue/vent/home/location-hover-bg.png');
+      // --image-tree-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-bg.png');
+      // --image-turn-location-top-bg: url('/@/assets/images/themify/deepblue/vent/home/turn-location-top-bg.png');
+      // --image-tree-icon-cover-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-icon-cover-bg.png');
+      // --image-tree-icon-cover-hover-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-icon-cover-hover-bg.png');
+      // --image-tohome: url('/@/assets/images/themify/deepblue/vent/home/tohome.png');
+      // --tree-node-select: #0963c1;
+      // --tree-node-hover: #0f376ccc;
+      // --location-bottom-bg: #21324855;
+      // --location-bottom-border: #aed1ff4d;
+    }
+  }
 
-@{theme-deepblue} {
   .scene-box {
-    // --image-modal-top: url('/@/assets/images/themify/deepblue/vent/home/modal-top.png');
-    // --image-tree-icon-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-icon-bg.png');
-    // --image-tree-icon-hover-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-icon-hover-bg.png');
-    // --image-tree-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-bg.png');
-    // --image-tree-expansion-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-expansion-bg.png');
-    // --image-tree-expansion-hover-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-expansion-hover-bg.png');
-    // --image-location-bg: url('/@/assets/images/themify/deepblue/vent/home/location-bg.png');
-    // --image-location-hover-bg: url('/@/assets/images/themify/deepblue/vent/home/location-hover-bg.png');
-    // --image-tree-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-bg.png');
-    // --image-turn-location-top-bg: url('/@/assets/images/themify/deepblue/vent/home/turn-location-top-bg.png');
-    // --image-tree-icon-cover-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-icon-cover-bg.png');
-    // --image-tree-icon-cover-hover-bg: url('/@/assets/images/themify/deepblue/vent/home/tree-icon-cover-hover-bg.png');
-    // --image-tohome: url('/@/assets/images/themify/deepblue/vent/home/tohome.png');
-    // --tree-node-select: #0963c1;
-    // --tree-node-hover: #0f376ccc;
-    // --location-bottom-bg: #21324855;
-    // --location-bottom-border: #aed1ff4d;
+    --image-modal-top: url('/@/assets/images/vent/home/modal-top.png');
+    --image-tree-icon-bg: url('/@/assets/images/vent/home/tree-icon-bg.png');
+    --image-tree-icon-hover-bg: url('/@/assets/images/vent/home/tree-icon-hover-bg.png');
+    --image-tree-bg: url('/@/assets/images/vent/home/tree-bg.png');
+    --image-tree-expansion-bg: url('/@/assets/images/vent/home/tree-expansion-bg.png');
+    --image-tree-expansion-hover-bg: url('/@/assets/images/vent/home/tree-expansion-hover-bg.png');
+    --image-location-bg: url('/@/assets/images/vent/home/location-bg.png');
+    --image-location-hover-bg: url('/@/assets/images/vent/home/location-hover-bg.png');
+    --image-turn-location-top-bg: url('/@/assets/images/vent/home/turn-location-top-bg.png');
+    --image-tree-icon-cover-bg: url('/@/assets/images/vent/home/tree-icon-cover-bg.png');
+    --image-tree-icon-cover-hover-bg: url('/@/assets/images/vent/home/tree-icon-cover-hover-bg.png');
+    --image-tohome: url('/@/assets/images/vent/home/tohome.png');
+    --tree-node-select: #00b1c8;
+    --tree-node-hover: #00b1c855;
+    --location-bottom-bg: #00709955;
+    --location-bottom-border: #aef3ff4d;
+  }
+
+  .top-header {
+    position: fixed;
+    width: 100%;
+    height: 56px;
+    background: var(--image-modal-top);
+    text-align: center;
+    line-height: 56px;
+    font-size: 28px;
+    color: #ffffffdd;
+    font-weight: 600;
+    z-index: 1;
+    letter-spacing: 2px;
+    font-size: 30px;
   }
-}
-
-.scene-box {
-  --image-modal-top: url('/@/assets/images/vent/home/modal-top.png');
-  --image-tree-icon-bg: url('/@/assets/images/vent/home/tree-icon-bg.png');
-  --image-tree-icon-hover-bg: url('/@/assets/images/vent/home/tree-icon-hover-bg.png');
-  --image-tree-bg: url('/@/assets/images/vent/home/tree-bg.png');
-  --image-tree-expansion-bg: url('/@/assets/images/vent/home/tree-expansion-bg.png');
-  --image-tree-expansion-hover-bg: url('/@/assets/images/vent/home/tree-expansion-hover-bg.png');
-  --image-location-bg: url('/@/assets/images/vent/home/location-bg.png');
-  --image-location-hover-bg: url('/@/assets/images/vent/home/location-hover-bg.png');
-  --image-turn-location-top-bg: url('/@/assets/images/vent/home/turn-location-top-bg.png');
-  --image-tree-icon-cover-bg: url('/@/assets/images/vent/home/tree-icon-cover-bg.png');
-  --image-tree-icon-cover-hover-bg: url('/@/assets/images/vent/home/tree-icon-cover-hover-bg.png');
-  --image-tohome: url('/@/assets/images/vent/home/tohome.png');
-  --tree-node-select: #00b1c8;
-  --tree-node-hover: #00b1c855;
-  --location-bottom-bg: #00709955;
-  --location-bottom-border: #aef3ff4d;
-}
-
-.top-header {
-  position: fixed;
-  width: 100%;
-  height: 56px;
-  background: var(--image-modal-top);
-  text-align: center;
-  line-height: 56px;
-  font-size: 28px;
-  color: #ffffffdd;
-  font-weight: 600;
-  z-index: 1;
-  letter-spacing: 2px;
-  font-size: 30px;
-}
-
-.select-node {
-  position: fixed;
-  top: 100px;
-  left: 10px;
-  color: var(--vent-font-color);
-  display: flex;
-  justify-content: center;
-  font-size: 22px;
-
-  .title {
-    margin-left: 10px;
+
+  .select-node {
+    position: fixed;
+    top: 100px;
+    left: 10px;
+    color: var(--vent-font-color);
+    display: flex;
+    justify-content: center;
+    font-size: 22px;
+
+    .title {
+      margin-left: 10px;
+    }
   }
-}
 
-.expansion-icon {
-  background: var(--image-tree-icon-bg) no-repeat;
-  background-size: contain;
-  position: absolute;
-  left: 190px;
-  top: 25px;
+  .expansion-icon {
+    background: var(--image-tree-icon-bg) no-repeat;
+    background-size: contain;
+    position: absolute;
+    left: 190px;
+    top: 25px;
+
+    &:hover {
+      background: var(--image-tree-icon-hover-bg) no-repeat;
+      background-size: contain;
+    }
+  }
 
-  &:hover {
-    background: var(--image-tree-icon-hover-bg) no-repeat;
+  .device-select {
+    width: 250px;
+    height: 500px;
+    background: var(--image-tree-bg) no-repeat;
+    position: fixed;
+    top: 100px;
+    left: 10px;
     background-size: contain;
+    pointer-events: auto;
+    padding: 20px 10px 30px 10px;
   }
-}
-
-.device-select {
-  width: 250px;
-  height: 500px;
-  background: var(--image-tree-bg) no-repeat;
-  position: fixed;
-  top: 100px;
-  left: 10px;
-  background-size: contain;
-  pointer-events: auto;
-  padding: 20px 10px 30px 10px;
-}
-.inspect-info-xj {
-  position: fixed;
-  top: 100px;
-  left: 250px;
-  width: 320px;
-  height: 272px;
-  padding: 20px;
-  background: url('@/assets/images/inspect-bg.png') no-repeat center;
-  background-size: 100% 100%;
-  box-sizing: border-box;
-  .info-xj-title {
-    width: 230px;
-    height: 36px;
-    line-height: 36px;
-    padding-left: 50px;
-    margin: 10px 0px;
-    color: #fff;
-    background: url('@/assets/images/inspect-title.png') no-repeat center;
+  .inspect-info-xj {
+    position: fixed;
+    top: 100px;
+    left: 250px;
+    width: 320px;
+    height: 272px;
+    padding: 20px;
+    background: url('@/assets/images/inspect-bg.png') no-repeat center;
     background-size: 100% 100%;
-  }
-  .info-xj-content {
-    display: flex;
-    flex-wrap: wrap;
-    height: calc(100% - 56px);
-    padding: 10px 0px;
     box-sizing: border-box;
-    .xj-content-item {
-      display: flex;
-      flex-direction: column;
-      justify-content: space-around;
-      align-items: center;
-      width: 126px;
-      height: 67px;
-      margin: 7px;
+    .info-xj-title {
+      width: 230px;
+      height: 36px;
+      line-height: 36px;
+      padding-left: 50px;
+      margin: 10px 0px;
       color: #fff;
-      padding-bottom: 5px;
-      background: url('@/assets/images/inspect-item.png') no-repeat center;
-      .content-item-val {
-        font-family: 'douyuFont';
-        color: #74e9fe;
+      background: url('@/assets/images/inspect-title.png') no-repeat center;
+      background-size: 100% 100%;
+    }
+    .info-xj-content {
+      display: flex;
+      flex-wrap: wrap;
+      height: calc(100% - 56px);
+      padding: 10px 0px;
+      box-sizing: border-box;
+      .xj-content-item {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
+        align-items: center;
+        width: 126px;
+        height: 67px;
+        margin: 7px;
+        color: #fff;
+        padding-bottom: 5px;
+        background: url('@/assets/images/inspect-item.png') no-repeat center;
+        .content-item-val {
+          font-family: 'douyuFont';
+          color: #74e9fe;
+        }
       }
     }
   }
-}
-
-.is-expansion-icon {
-  padding: 5px;
-  pointer-events: auto;
-  z-index: 999;
-}
-
-.device-select-show {
-  left: 10px;
-  animation-name: treeShow;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
-}
-
-.device-select-hide {
-  left: -250px;
-  animation-name: treeHide;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
-}
-
-.node-select-show {
-  width: 276px;
-  height: 44px;
-  background: var(--image-tree-expansion-bg) no-repeat;
-  left: 10px;
-  animation-name: treeShow;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
-  display: flex;
-  align-items: center;
-  margin-left: 0;
-  justify-content: flex-start;
-  pointer-events: auto;
-
-  &:hover {
-    background: var(--image-tree-expansion-hover-bg) no-repeat;
+
+  .is-expansion-icon {
+    padding: 5px;
+    pointer-events: auto;
+    z-index: 999;
   }
 
-  .put-away-icon {
-    position: relative;
-    display: inline-block;
-    left: 4px;
+  .device-select-show {
+    left: 10px;
+    animation-name: treeShow;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
   }
-}
-
-.node-select-hide {
-  left: -400px;
-  animation-name: treeHide;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
-}
-
-.device-select-box {
-  width: 208px;
-  height: 450px;
-  overflow-y: auto;
-  color: var(--vent-font-color);
-
-  :deep(.zxm-tree) {
-    background: transparent !important;
-    color: var(--vent-font-color) !important;
-
-    .zxm-tree-switcher {
-      background: transparent !important;
-    }
 
-    .zxm-tree-node-content-wrapper.zxm-tree-node-selected {
-      background-color: var(--tree-node-select);
-    }
+  .device-select-hide {
+    left: -250px;
+    animation-name: treeHide;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
+  }
+
+  .node-select-show {
+    width: 276px;
+    height: 44px;
+    background: var(--image-tree-expansion-bg) no-repeat;
+    left: 10px;
+    animation-name: treeShow;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
+    display: flex;
+    align-items: center;
+    margin-left: 0;
+    justify-content: flex-start;
+    pointer-events: auto;
 
-    .zxm-tree-node-content-wrapper:hover {
-      background-color: var(--tree-node-hover);
+    &:hover {
+      background: var(--image-tree-expansion-hover-bg) no-repeat;
     }
 
-    input {
-      height: 0px !important;
+    .put-away-icon {
+      position: relative;
+      display: inline-block;
+      left: 4px;
     }
   }
 
-  &::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 10px;
-    background: #ededed22;
-    height: 100px;
+  .node-select-hide {
+    left: -400px;
+    animation-name: treeHide;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
   }
 
-  &::-webkit-scrollbar-thumb {
-    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    background: #4288a444;
-  }
-}
-
-.location-icon {
-  width: 46px;
-  height: 178px;
-  position: absolute;
-  top: 100px;
-  background: var(--image-location-bg) no-repeat;
-  background-size: contain;
-  writing-mode: vertical-lr;
-  line-height: 46px;
-  color: var(--vent-font-color);
-  padding-top: 10px;
-  pointer-events: auto;
-  cursor: pointer;
-
-  &:hover {
-    background: var(--image-location-hover-bg) no-repeat;
-  }
+  .device-select-box {
+    width: 208px;
+    height: 450px;
+    overflow-y: auto;
+    color: var(--vent-font-color);
 
-  .location-text {
-    padding-top: 20px;
-    letter-spacing: 3px;
-    font-size: 16px;
-  }
-}
+    :deep(.zxm-tree) {
+      background: transparent !important;
+      color: var(--vent-font-color) !important;
 
-.location-select {
-  position: fixed;
-  top: 100px;
-  pointer-events: auto;
+      .zxm-tree-switcher {
+        background: transparent !important;
+      }
 
-  .location-select-box {
-    width: 100%;
-    height: 100%;
-    position: relative;
+      .zxm-tree-node-content-wrapper.zxm-tree-node-selected {
+        background-color: var(--tree-node-select);
+      }
 
-    &::before {
-      content: '';
-      position: absolute;
-      width: 230px;
-      height: 500px;
-      top: 0;
-      left: 0;
-      background: var(--image-tree-bg) no-repeat;
-      background-size: contain;
-      transform: rotateY(180deg);
-      z-index: -1;
+      .zxm-tree-node-content-wrapper:hover {
+        background-color: var(--tree-node-hover);
+      }
+
+      input {
+        height: 0px !important;
+      }
     }
 
-    .location-top-title {
-      color: var(--vent-font-color);
-      position: absolute;
-      width: 225px;
-      height: 68px;
-      background: var(--image-turn-location-top-bg) no-repeat;
-      background-size: contain;
-      top: 5px;
-      left: 5px;
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-      align-items: flex-end;
+    &::-webkit-scrollbar-track {
+      -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+      border-radius: 10px;
+      background: #ededed22;
+      height: 100px;
+    }
 
-      .title {
-        font-size: 18px;
-        position: relative;
-        top: -14px;
-        right: 15px;
-      }
+    &::-webkit-scrollbar-thumb {
+      -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+      background: #4288a444;
     }
+  }
 
-    .location-expansion-icon {
-      background: var(--image-tree-icon-cover-bg) no-repeat;
-      background-size: contain;
+  .location-icon {
+    width: 46px;
+    height: 178px;
+    position: absolute;
+    top: 100px;
+    background: var(--image-location-bg) no-repeat;
+    background-size: contain;
+    writing-mode: vertical-lr;
+    line-height: 46px;
+    color: var(--vent-font-color);
+    padding-top: 10px;
+    pointer-events: auto;
+    cursor: pointer;
+
+    &:hover {
+      background: var(--image-location-hover-bg) no-repeat;
+    }
+
+    .location-text {
+      padding-top: 20px;
+      letter-spacing: 3px;
+      font-size: 16px;
+    }
+  }
+
+  .location-select {
+    position: fixed;
+    top: 100px;
+    pointer-events: auto;
+
+    .location-select-box {
+      width: 100%;
+      height: 100%;
       position: relative;
-      left: 10px;
-      top: -15px;
-      padding: 5px;
 
-      &:hover {
-        background: var(--image-tree-icon-cover-hover-bg) no-repeat;
+      &::before {
+        content: '';
+        position: absolute;
+        width: 230px;
+        height: 500px;
+        top: 0;
+        left: 0;
+        background: var(--image-tree-bg) no-repeat;
         background-size: contain;
+        transform: rotateY(180deg);
+        z-index: -1;
       }
-    }
-  }
 
-  .location-container {
-    width: 200px;
-    height: 390px;
-    position: absolute;
-    display: flex;
-    flex-direction: column;
-    top: 80px;
-    left: 18px;
-    overflow-y: auto;
+      .location-top-title {
+        color: var(--vent-font-color);
+        position: absolute;
+        width: 225px;
+        height: 68px;
+        background: var(--image-turn-location-top-bg) no-repeat;
+        background-size: contain;
+        top: 5px;
+        left: 5px;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: flex-end;
+
+        .title {
+          font-size: 18px;
+          position: relative;
+          top: -14px;
+          right: 15px;
+        }
+      }
 
-    .location-item {
-      color: var(--vent-font-color);
-      line-height: 30px;
-      display: flex;
-      justify-content: space-between;
-      // background-image: var(--vent-gas-list-item-bg-img);
-      background-image: linear-gradient(to left, #39f5ff05, #39f5ff10);
-      margin: 3px 0;
-
-      .item-title {
-        width: 80px;
-        text-align: right;
-        color: var(--vent-table-action-link);
+      .location-expansion-icon {
+        background: var(--image-tree-icon-cover-bg) no-repeat;
+        background-size: contain;
+        position: relative;
+        left: 10px;
+        top: -15px;
+        padding: 5px;
+
+        &:hover {
+          background: var(--image-tree-icon-cover-hover-bg) no-repeat;
+          background-size: contain;
+        }
       }
     }
 
-    .location-bottom-btn {
-      width: 100%;
-      color: var(--vent-font-color);
+    .location-container {
+      width: 200px;
+      height: 390px;
+      position: absolute;
       display: flex;
-      justify-content: flex-end;
-      margin-top: 20px;
+      flex-direction: column;
+      top: 80px;
+      left: 18px;
+      overflow-y: auto;
+
+      .location-item {
+        color: var(--vent-font-color);
+        line-height: 30px;
+        display: flex;
+        justify-content: space-between;
+        // background-image: var(--vent-gas-list-item-bg-img);
+        background-image: linear-gradient(to left, #39f5ff05, #39f5ff10);
+        margin: 3px 0;
+
+        .item-title {
+          width: 80px;
+          text-align: right;
+          color: var(--vent-table-action-link);
+        }
+      }
 
-      span {
-        display: inline-block;
+      .location-bottom-btn {
         width: 100%;
-        background: var(--location-bottom-bg);
-        border-radius: 3px;
-        border: 1px solid var(--location-bottom-border);
-        text-align: center;
-        padding: 2px 0;
-        cursor: pointer;
-
-        &:hover {
-          background: #00557422;
+        color: var(--vent-font-color);
+        display: flex;
+        justify-content: flex-end;
+        margin-top: 20px;
+
+        span {
+          display: inline-block;
+          width: 100%;
+          background: var(--location-bottom-bg);
+          border-radius: 3px;
+          border: 1px solid var(--location-bottom-border);
+          text-align: center;
+          padding: 2px 0;
+          cursor: pointer;
+
+          &:hover {
+            background: #00557422;
+          }
         }
       }
     }
   }
-}
-
-.location-select-show {
-  right: 240px;
-  animation-name: locationShow;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
-}
-
-.location-select-hide {
-  right: -2px;
-  animation-name: locationHide;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
-}
-
-.location-btn-show {
-  right: -0px;
-  animation-name: locationBtnShow;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
-}
-
-.location-btn-hide {
-  right: -240px;
-  animation-name: locationBtnHide;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
-}
-
-.tabs-box {
-  height: 290px;
-}
-
-.bottom-tabs-box {
-  position: relative;
 
-  .tabs-box {
-    width: calc(100% - 12px) !important;
-    bottom: 3px !important;
-    background-color: red;
+  .location-select-show {
+    right: 240px;
+    animation-name: locationShow;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
   }
 
-  .to-small {
-    position: absolute;
-    top: -65px;
-    right: 36px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+  .location-select-hide {
+    right: -2px;
+    animation-name: locationHide;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
+  }
 
-    .to-home {
-      width: 60px;
-      height: 60px;
-      background: var(--image-tohome) no-repeat center;
-      background-size: auto;
-      padding: 8px;
+  .location-btn-show {
+    right: -0px;
+    animation-name: locationBtnShow;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
+  }
 
-      &:hover {
-        background-color: rgba(79, 104, 134, 0.418);
-      }
-    }
+  .location-btn-hide {
+    right: -240px;
+    animation-name: locationBtnHide;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s cubic-bezier(0.165, 0.84, 0.44, 1) 0.5s;
+  }
 
-    .table-show-icon {
-      width: 30px;
-      height: 30px;
-      font-size: 30px;
-      color: var(--vent-font-color);
-      margin-left: 10px;
-    }
+  .tabs-box {
+    height: 290px;
   }
 
-  .device-button-group {
-    position: absolute;
-    top: -30px;
-    display: flex;
-    width: 100%;
+  .bottom-tabs-box {
+    position: relative;
+
+    .tabs-box {
+      width: calc(100% - 12px) !important;
+      bottom: 3px !important;
+      background-color: red;
+    }
 
-    .device-button {
-      height: 26px;
-      padding: 0 20px;
-      background: linear-gradient(45deg, #04e6fb55, #0c5cab55);
-      clip-path: polygon(10px 0, 0 50%, 10px 100%, 100% 100%, calc(100% - 10px) 50%, 100% 0);
+    .to-small {
+      position: absolute;
+      top: -65px;
+      right: 36px;
       display: flex;
-      justify-content: center;
       align-items: center;
-      color: var(--vent-font-color);
-      position: relative;
-      cursor: pointer;
+      justify-content: center;
 
-      &:nth-child(1) {
-        left: calc(-6px * 1);
-      }
+      .to-home {
+        width: 60px;
+        height: 60px;
+        background: var(--image-tohome) no-repeat center;
+        background-size: auto;
+        padding: 8px;
 
-      &:nth-child(2) {
-        left: calc(-6px * 2);
+        &:hover {
+          background-color: rgba(79, 104, 134, 0.418);
+        }
       }
 
-      &:nth-child(3) {
-        left: calc(-6px * 3);
+      .table-show-icon {
+        width: 30px;
+        height: 30px;
+        font-size: 30px;
+        color: var(--vent-font-color);
+        margin-left: 10px;
       }
+    }
 
-      &:nth-child(4) {
-        left: calc(-6px * 4);
-      }
+    .device-button-group {
+      position: absolute;
+      top: -30px;
+      display: flex;
+      width: 100%;
 
-      &:nth-child(5) {
-        left: calc(-6px * 5);
-      }
+      .device-button {
+        height: 26px;
+        padding: 0 20px;
+        background: linear-gradient(45deg, #04e6fb55, #0c5cab55);
+        clip-path: polygon(10px 0, 0 50%, 10px 100%, 100% 100%, calc(100% - 10px) 50%, 100% 0);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: var(--vent-font-color);
+        position: relative;
+        cursor: pointer;
 
-      &:nth-child(6) {
-        left: calc(-6px * 6);
-      }
+        &:nth-child(1) {
+          left: calc(-6px * 1);
+        }
 
-      &:nth-child(7) {
-        left: calc(-6px * 7);
-      }
+        &:nth-child(2) {
+          left: calc(-6px * 2);
+        }
 
-      &:nth-child(8) {
-        left: calc(-6px * 8);
-      }
+        &:nth-child(3) {
+          left: calc(-6px * 3);
+        }
 
-      &:nth-child(9) {
-        left: calc(-6px * 9);
-      }
+        &:nth-child(4) {
+          left: calc(-6px * 4);
+        }
 
-      &:nth-child(10) {
-        left: calc(-6px * 10);
-      }
+        &:nth-child(5) {
+          left: calc(-6px * 5);
+        }
 
-      &:nth-child(11) {
-        left: calc(-6px * 11);
-      }
+        &:nth-child(6) {
+          left: calc(-6px * 6);
+        }
 
-      &:nth-child(12) {
-        left: calc(-6px * 12);
-      }
+        &:nth-child(7) {
+          left: calc(-6px * 7);
+        }
 
-      &:nth-child(13) {
-        left: calc(-6px * 13);
-      }
+        &:nth-child(8) {
+          left: calc(-6px * 8);
+        }
 
-      &:nth-child(14) {
-        left: calc(-6px * 14);
-      }
+        &:nth-child(9) {
+          left: calc(-6px * 9);
+        }
 
-      &:nth-child(15) {
-        left: calc(-6px * 15);
-      }
+        &:nth-child(10) {
+          left: calc(-6px * 10);
+        }
 
-      &:nth-child(16) {
-        left: calc(-6px * 16);
-      }
+        &:nth-child(11) {
+          left: calc(-6px * 11);
+        }
 
-      &:nth-child(17) {
-        left: calc(-6px * 17);
-      }
+        &:nth-child(12) {
+          left: calc(-6px * 12);
+        }
 
-      &:nth-child(18) {
-        left: calc(-6px * 18);
-      }
+        &:nth-child(13) {
+          left: calc(-6px * 13);
+        }
 
-      &:nth-child(19) {
-        left: calc(-6px * 19);
+        &:nth-child(14) {
+          left: calc(-6px * 14);
+        }
+
+        &:nth-child(15) {
+          left: calc(-6px * 15);
+        }
+
+        &:nth-child(16) {
+          left: calc(-6px * 16);
+        }
+
+        &:nth-child(17) {
+          left: calc(-6px * 17);
+        }
+
+        &:nth-child(18) {
+          left: calc(-6px * 18);
+        }
+
+        &:nth-child(19) {
+          left: calc(-6px * 19);
+        }
+
+        &:first-child {
+          clip-path: polygon(0 0, 10px 50%, 0 100%, 100% 100%, calc(100% - 10px) 50%, 100% 0);
+        }
       }
 
-      &:first-child {
-        clip-path: polygon(0 0, 10px 50%, 0 100%, 100% 100%, calc(100% - 10px) 50%, 100% 0);
+      .device-active {
+        background: linear-gradient(45deg, #04e6fb, #0c5cab);
+
+        &::before {
+          border-color: #0efcff;
+          box-shadow: 1px 1px 3px 1px #0efcff inset;
+        }
       }
     }
 
-    .device-active {
-      background: linear-gradient(45deg, #04e6fb, #0c5cab);
+    .table-hide-icon {
+      color: var(--vent-font-color);
+      cursor: pointer;
+      position: absolute;
+      right: 20px;
+      top: 10px;
+      z-index: 9999;
+    }
+
+    .enter-detail {
+      color: var(--vent-font-color);
+      cursor: pointer;
+      position: absolute;
+      right: 35px;
+      top: 35px;
+      padding: 5px;
+      border-radius: 5px;
+      margin-left: 8px;
+      margin-right: 8px;
+      width: auto;
+      height: 33px !important;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: var(--vent-font-color);
+      padding: 5px 15px 5px 15px;
+      z-index: 999;
+      cursor: pointer;
+
+      &:hover {
+        background: var(--vent-device-manager-control-btn-hover);
+      }
 
       &::before {
-        border-color: #0efcff;
-        box-shadow: 1px 1px 3px 1px #0efcff inset;
+        width: calc(100% - 6px);
+        height: 27px;
+        content: '';
+        position: absolute;
+        top: 3px;
+        right: 0;
+        left: 3px;
+        bottom: 0;
+        z-index: -1;
+        border-radius: inherit;
+        /*important*/
+        background: var(--vent-device-manager-control-btn);
       }
     }
   }
 
-  .table-hide-icon {
-    color: var(--vent-font-color);
-    cursor: pointer;
-    position: absolute;
-    right: 20px;
-    top: 10px;
-    z-index: 9999;
+  .table-hide {
+    height: 0px;
+    animation-name: tableHide;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s;
   }
 
-  .enter-detail {
-    color: var(--vent-font-color);
-    cursor: pointer;
-    position: absolute;
-    right: 35px;
-    top: 35px;
-    padding: 5px;
-    border-radius: 5px;
-    margin-left: 8px;
-    margin-right: 8px;
-    width: auto;
-    height: 33px !important;
+  .table-show {
+    height: 290px;
+    animation-name: tableShow;
+    /* 持续时间 */
+    animation-duration: 1s;
+    transition: all 1s;
+  }
+
+  .location-form {
     display: flex;
-    align-items: center;
-    justify-content: center;
-    color: var(--vent-font-color);
-    padding: 5px 15px 5px 15px;
-    z-index: 999;
-    cursor: pointer;
+    margin: 8px;
 
-    &:hover {
-      background: var(--vent-device-manager-control-btn-hover);
+    .location-form-item {
+      width: 400px;
+
+      .location-form-label {
+        width: 100px;
+        display: inline-block;
+        color: var(--vent-font-color);
+      }
+
+      input {
+        background: transparent !important;
+        color: var(--vent-font-color);
+        border: 1px solid var(--vent-form-item-border) !important;
+      }
     }
 
-    &::before {
-      width: calc(100% - 6px);
-      height: 27px;
-      content: '';
-      position: absolute;
-      top: 3px;
-      right: 0;
-      left: 3px;
-      bottom: 0;
-      z-index: -1;
-      border-radius: inherit;
-      /*important*/
-      background: var(--vent-device-manager-control-btn);
+    .zxm-select-selector {
+      width: 200px !important;
     }
   }
-}
-
-.table-hide {
-  height: 0px;
-  animation-name: tableHide;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s;
-}
-
-.table-show {
-  height: 290px;
-  animation-name: tableShow;
-  /* 持续时间 */
-  animation-duration: 1s;
-  transition: all 1s;
-}
-
-.location-form {
-  display: flex;
-  margin: 8px;
-
-  .location-form-item {
-    width: 400px;
-
-    .location-form-label {
-      width: 100px;
-      display: inline-block;
-      color: var(--vent-font-color);
+
+  @keyframes tableShow {
+    0% {
+      height: 0px;
+      opacity: 0;
     }
 
-    input {
-      background: transparent !important;
-      color: var(--vent-font-color);
-      border: 1px solid var(--vent-form-item-border) !important;
+    100% {
+      height: 290px;
+      opacity: 1;
     }
   }
 
-  .zxm-select-selector {
-    width: 200px !important;
-  }
-}
+  @keyframes tableHide {
+    0% {
+      opacity: 1;
+    }
 
-@keyframes tableShow {
-  0% {
-    height: 0px;
-    opacity: 0;
+    100% {
+      height: 0px;
+      opacity: 0;
+    }
   }
 
-  100% {
-    height: 290px;
-    opacity: 1;
-  }
-}
+  @keyframes treeShow {
+    0% {
+      left: -400px;
+      opacity: 0;
+    }
 
-@keyframes tableHide {
-  0% {
-    opacity: 1;
+    100% {
+      left: 10px;
+      opacity: 1;
+    }
   }
 
-  100% {
-    height: 0px;
-    opacity: 0;
-  }
-}
+  @keyframes treeHide {
+    0% {
+      left: 10px;
+      opacity: 1;
+    }
 
-@keyframes treeShow {
-  0% {
-    left: -400px;
-    opacity: 0;
+    100% {
+      left: -400px;
+      opacity: 0;
+    }
   }
 
-  100% {
-    left: 10px;
-    opacity: 1;
-  }
-}
+  @keyframes locationShow {
+    0% {
+      right: 0px;
+      opacity: 0;
+    }
 
-@keyframes treeHide {
-  0% {
-    left: 10px;
-    opacity: 1;
+    100% {
+      right: 240px;
+      opacity: 1;
+    }
   }
 
-  100% {
-    left: -400px;
-    opacity: 0;
-  }
-}
+  @keyframes locationHide {
+    0% {
+      right: 240px;
+      opacity: 1;
+    }
 
-@keyframes locationShow {
-  0% {
-    right: 0px;
-    opacity: 0;
+    100% {
+      right: 0;
+      opacity: 0;
+    }
   }
 
-  100% {
-    right: 240px;
-    opacity: 1;
-  }
-}
+  @keyframes locationBtnShow {
+    0% {
+      right: -240px;
+      opacity: 0;
+    }
 
-@keyframes locationHide {
-  0% {
-    right: 240px;
-    opacity: 1;
+    100% {
+      right: -2px;
+      opacity: 1;
+    }
   }
 
-  100% {
-    right: 0;
-    opacity: 0;
-  }
-}
+  @keyframes locationBtnHide {
+    0% {
+      right: -2px;
+      opacity: 1;
+    }
 
-@keyframes locationBtnShow {
-  0% {
-    right: -240px;
-    opacity: 0;
+    100% {
+      right: -240px;
+      opacity: 0;
+    }
   }
 
-  100% {
-    right: -2px;
-    opacity: 1;
+  :deep(.@{ventSpace}-tabs-tabpane-active) {
+    // overflow: auto;
+    height: 100%;
   }
-}
 
-@keyframes locationBtnHide {
-  0% {
-    right: -2px;
-    opacity: 1;
+  :deep(.zxm-select-dropdown) {
+    left: 0 !important;
+    color: #000000 !important;
   }
 
-  100% {
-    right: -240px;
-    opacity: 0;
+  :deep(.zxm-select-selector) {
+    height: 34px !important;
+    line-height: 34px !important;
   }
-}
 
-:deep(.@{ventSpace}-tabs-tabpane-active) {
-  // overflow: auto;
-  height: 100%;
-}
-
-:deep(.zxm-select-dropdown) {
-  left: 0 !important;
-  color: #000000 !important;
-}
-
-:deep(.zxm-select-selector) {
-  height: 34px !important;
-  line-height: 34px !important;
-}
-
-:deep(.zxm-input) {
-  height: 32px !important;
-  line-height: 32px !important;
-
-  .zxm-select-selection-item {
+  :deep(.zxm-input) {
+    height: 32px !important;
     line-height: 32px !important;
+
+    .zxm-select-selection-item {
+      line-height: 32px !important;
+    }
   }
-}
-
-// :deep(.@{ventSpace}-pagination){
-//   margin-right: 20px !important;
-//   margin-top: 5px !important;
-//   display: flex;
-//   align-items: center;
-// }
+
+  // :deep(.@{ventSpace}-pagination){
+  //   margin-right: 20px !important;
+  //   margin-top: 5px !important;
+  //   display: flex;
+  //   align-items: center;
+  // }
 </style>

+ 2 - 2
src/views/vent/monitorManager/fanLocalMonitor/fanLocal.three.ts

@@ -357,7 +357,7 @@ export const addCssText = () => {
       fanLocalCSS3D.name = 'text9';
       fanLocalCSS3D.scale.set(0.07, 0.07, 0.07);
       fanLocalCSS3D.rotation.y = -Math.PI / 2;
-      fanLocalCSS3D.position.set(-40, 6, -41);
+      fanLocalCSS3D.position.set(-18, 7.46, -35.28);
       group.add(fanLocalCSS3D);
     }
   }
@@ -368,7 +368,7 @@ export const addCssText = () => {
       fanLocalCSS3D.name = 'text10';
       fanLocalCSS3D.scale.set(0.1, 0.1, 0.1);
       fanLocalCSS3D.rotation.y = -Math.PI / 2;
-      fanLocalCSS3D.position.set(100, 10, -45);
+      fanLocalCSS3D.position.set(80, 9, -43);
       group.add(fanLocalCSS3D);
     }
   }

+ 105 - 74
src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -173,7 +173,13 @@
       <div class="top-right row">
         <template v-for="(item, index) in modalTypeArr.rightBtnArr" :key="index">
           <div
-            v-if="(item.permission === 'fanLocal:gasAlarmSet' || item.permission === 'fanLocal:kkjc') && hasPermission(item.permission)"
+            v-if="
+              (item.permission === 'fanLocal:gasAlarmSet' ||
+                item.permission === 'fanLocal:kkjc' ||
+                item.permission === 'fanLocal:supplyAir' ||
+                item.permission === 'fanLocal:dischargeGas') &&
+              hasPermission(item.permission)
+            "
             :class="{ 'button-box': btnClick, 'button-disable': !btnClick }"
             @click="showModal(item)"
             >{{ item.value }}</div
@@ -186,7 +192,7 @@
     </div>
     <div class="data-show-box" v-if="!loading">
       <div class="data-item" v-if="leftColumns.length > 0">
-        <div class="item-header">环境监测</div>
+        <div class="item-header">环境监测与评价分析</div>
         <div class="item-container">
           <div class="tab">
             <div class="tab-item" :class="{ 'tab-item-active-r': warningMonitorRowIndex === 0 }" @click="selectDevice('warningMonitorRowIndex', 0)"
@@ -223,7 +229,7 @@
           <div class="container-group" style="max-height: 250px; overflow-y: auto">
             <div class="warning-header">
               <div class="header-item">
-                <div class="header-title">回风流甲烷监测</div>
+                <div class="header-title">评价分析</div>
               </div>
             </div>
             <template v-if="selectData.deviceType">
@@ -233,7 +239,7 @@
                   <CaretRightOutlined class="icon-style" />
                 </div>
                 <div class="item-name">{{ data.title }}</div>
-                <div class="item-value">{{ selectData[data.dataIndex] ? selectData[data.value] : '-' }}</div>
+                <div :class="['item-value', { 'text-red-bold': data.value === '超限' }]">{{ data.value ? data.value : '-' }}</div>
               </div>
             </template>
           </div>
@@ -241,7 +247,7 @@
       </div>
       <div>
         <div class="data-item" v-if="rightColumns.length > 0">
-          <div class="item-header">设备故障诊断与分析预警</div>
+          <div class="item-header">设备故障诊断与预警</div>
           <div class="item-container">
             <div class="tab">
               <div class="tab-item" :class="{ 'tab-item-active-r': dataMonitorRowIndex == 0 }" @click="selectDevice('dataMonitorRowIndex', 0)"
@@ -277,7 +283,7 @@
                   </div>
                 </template>
               </div>
-              <div class="warning-group" style="max-height: 200px; overflow-y: auto">
+              <div class="warning-group" style="max-height: 250px; overflow-y: auto">
                 <div class="warning-header">
                   <div class="header-item">
                     <div class="header-title">设备报警</div>
@@ -285,67 +291,70 @@
                   </div>
                 </div>
                 <template v-if="deviceType">
-                  <div v-for="(state, index) in rightColumns" :key="index">
-                    <template v-if="state.dataIndex.endsWith('_w')">
-                      <div class="warning-item">
-                        <div class="item-name"> <div class="icon"></div> {{ state.title }} </div>
-                        <div v-if="state.dataIndex.startsWith('Fan')">
-                          <div class="signal-item" v-if="warningMonitorRowIndex == 0">
-                            <div
-                              class="signal-round"
-                              :class="{
-                                'signal-round-run': selectData[state.dataIndex.replace('Fan', 'Fan1')] == '0',
-                                'signal-round-warning':
-                                  selectData[state.dataIndex.replace('Fan', 'Fan1')] !== undefined &&
-                                  selectData[state.dataIndex.replace('Fan', 'Fan1')] == '1',
-                                'signal-round-gry': selectData[state.dataIndex.replace('Fan', 'Fan1')] === undefined,
-                              }"
-                            ></div>
-                            <div class="vent-margin-l-8">{{
-                              selectData[state.dataIndex.replace('Fan', 'Fan1')] === undefined
-                                ? '无状态'
-                                : selectData[state.dataIndex.replace('Fan', 'Fan1')] == '0'
-                                ? '正常'
-                                : '异常'
-                            }}</div>
+                  <div style="height: 100%; text-align: center; color: #fff" v-if="rightColumns.length < 1"> 暂无数据 </div>
+                  <div v-else>
+                    <div v-for="(state, index) in rightColumns" :key="index">
+                      <template v-if="state.dataIndex.endsWith('_w')">
+                        <div class="warning-item">
+                          <div class="item-name"> <div class="icon"></div> {{ state.title }} </div>
+                          <div v-if="state.dataIndex.startsWith('Fan')">
+                            <div class="signal-item" v-if="warningMonitorRowIndex == 0">
+                              <div
+                                class="signal-round"
+                                :class="{
+                                  'signal-round-run': selectData[state.dataIndex.replace('Fan', 'Fan1')] == '0',
+                                  'signal-round-warning':
+                                    selectData[state.dataIndex.replace('Fan', 'Fan1')] !== undefined &&
+                                    selectData[state.dataIndex.replace('Fan', 'Fan1')] == '1',
+                                  'signal-round-gry': selectData[state.dataIndex.replace('Fan', 'Fan1')] === undefined,
+                                }"
+                              ></div>
+                              <div class="vent-margin-l-8">{{
+                                selectData[state.dataIndex.replace('Fan', 'Fan1')] === undefined
+                                  ? '无状态'
+                                  : selectData[state.dataIndex.replace('Fan', 'Fan1')] == '0'
+                                  ? '正常'
+                                  : '异常'
+                              }}</div>
+                            </div>
+                            <div class="signal-item" v-if="warningMonitorRowIndex == 1">
+                              <div
+                                class="signal-round"
+                                :class="{
+                                  'signal-round-run': selectData[state.dataIndex.replace('Fan', 'Fan2')] == '0',
+                                  'signal-round-warning':
+                                    selectData[state.dataIndex.replace('Fan', 'Fan2')] != undefined &&
+                                    selectData[state.dataIndex.replace('Fan', 'Fan2')] == '1',
+                                  'signal-round-gry': selectData[state.dataIndex.replace('Fan', 'Fan2')] == undefined,
+                                }"
+                              ></div>
+                              <div class="vent-margin-l-8">{{
+                                selectData[state.dataIndex.replace('Fan', 'Fan2')] == undefined
+                                  ? '无状态'
+                                  : selectData[state.dataIndex.replace('Fan', 'Fan2')] == '0'
+                                  ? '正常'
+                                  : '异常'
+                              }}</div>
+                            </div>
                           </div>
-                          <div class="signal-item" v-if="warningMonitorRowIndex == 1">
-                            <div
-                              class="signal-round"
-                              :class="{
-                                'signal-round-run': selectData[state.dataIndex.replace('Fan', 'Fan2')] == '0',
-                                'signal-round-warning':
-                                  selectData[state.dataIndex.replace('Fan', 'Fan2')] != undefined &&
-                                  selectData[state.dataIndex.replace('Fan', 'Fan2')] == '1',
-                                'signal-round-gry': selectData[state.dataIndex.replace('Fan', 'Fan2')] == undefined,
-                              }"
-                            ></div>
-                            <div class="vent-margin-l-8">{{
-                              selectData[state.dataIndex.replace('Fan', 'Fan2')] == undefined
-                                ? '无状态'
-                                : selectData[state.dataIndex.replace('Fan', 'Fan2')] == '0'
-                                ? '正常'
-                                : '异常'
-                            }}</div>
+                          <div v-else>
+                            <div class="signal-item">
+                              <div
+                                class="signal-round vent-margin-l-8"
+                                :class="{
+                                  'signal-round-run': selectData[state.dataIndex] == '0',
+                                  'signal-round-warning': selectData[state.dataIndex] !== undefined && selectData[state.dataIndex] == '1',
+                                  'signal-round-gry': selectData[state.dataIndex] === undefined,
+                                }"
+                              ></div>
+                              <div class="vent-margin-l-8">{{
+                                selectData[state.dataIndex] === undefined ? '无状态' : selectData[state.dataIndex] == '0' ? '正常' : '异常'
+                              }}</div>
+                            </div>
                           </div>
                         </div>
-                        <div v-else>
-                          <div class="signal-item">
-                            <div
-                              class="signal-round vent-margin-l-8"
-                              :class="{
-                                'signal-round-run': selectData[state.dataIndex] == '0',
-                                'signal-round-warning': selectData[state.dataIndex] !== undefined && selectData[state.dataIndex] == '1',
-                                'signal-round-gry': selectData[state.dataIndex] === undefined,
-                              }"
-                            ></div>
-                            <div class="vent-margin-l-8">{{
-                              selectData[state.dataIndex] === undefined ? '无状态' : selectData[state.dataIndex] == '0' ? '正常' : '异常'
-                            }}</div>
-                          </div>
-                        </div>
-                      </div>
-                    </template>
+                      </template>
+                    </div>
                   </div>
                 </template>
               </div>
@@ -795,9 +804,14 @@ const modalTypeArr = reactive({
       permission: 'fanLocal:control',
     },
     // {
-    //   key: 'gasAlarm',
-    //   value: '瓦斯报警',
-    //   permission: 'fanLocal:control',
+    //   key: 'dischargeGas',
+    //   value: '智能排放瓦斯',
+    //   permission: 'fanLocal:dischargeGas',
+    // },
+    // {
+    //   key: 'supplyAir',
+    //   value: '按需供风联动',
+    //   permission: 'fanLocal:supplyAir',
     // },
   ],
 });
@@ -872,9 +886,9 @@ let selectData = reactive(lodash.cloneDeep(initData));
 const rightColumns = ref<BasicColumn[]>([]);
 const leftColumns = ref<BasicColumn[]>([]);
 const leftColumns1 = ref<any[]>([
-  { title: '供风充足评价', value: false },
-  { title: '回风流超限评价', value: false },
-  { title: '漏风率评价', value: false },
+  { title: '供风充足评价', value: '' },
+  { title: '回风流超限评价', value: '' },
+  { title: '漏风率评价', value: '' },
 ]);
 const devicekide = ref(deviceTypeDicts && deviceTypeDicts.length > 0 ? deviceTypeDicts[0]['value'] : 'fanlocal');
 const deviceType = ref(selectData.deviceType);
@@ -1015,10 +1029,21 @@ async function getDataSource() {
         // }
         const m3 = data.windSpeed_merge;
         const fsectarea = data.windSectionArea_merge;
-        const needq = data.totalAirPressureAirVolume_merge;
+        const needq = data.needq;
+        const airLeakageRatePerHundred = data.airLeakageRatePerHundred_merge;
         const airVolume = m3 * fsectarea; // 计算风量
         // 更新供风充足评价
-        leftColumns1.value[0].value = airVolume >= needq;
+        leftColumns1.value[0].value = airVolume >= needq ? '充足' : '不充足';
+        if (data.tunnelType === 'coalTunnel') {
+          leftColumns1.value[1].value = m3 < 0.25 ? '超限' : '正常';
+        } else if (data.tunnelType === 'rockTunnel' || data.tunnelType === 'coalRockTunnel') {
+          leftColumns1.value[1].value = m3 < 0.15 ? '超限' : '正常';
+        }
+        if (data.airLeakageRatePerHundredX === '' || data.airLeakageRatePerHundred_merge === '') {
+          leftColumns1.value[2].value = '-';
+        } else {
+          leftColumns1.value[2].value = airLeakageRatePerHundred <= data.airLeakageRatePerHundredX ? '满足' : '不满足';
+        }
         dataSource.value.push(data);
       });
       if (selectRowIndex.value > -1) {
@@ -1701,7 +1726,10 @@ onUnmounted(() => {
 
         .item-name {
           width: 180px;
-          line-height: 60px;
+          display: flex;
+          align-items: center; /* 垂直居中 */
+          word-wrap: break-word;
+          white-space: normal;
         }
 
         .item-value {
@@ -1714,7 +1742,6 @@ onUnmounted(() => {
           border: 1px solid var(--vent-base-border);
           border-radius: 13px;
           background: linear-gradient(to right, #00f5fe44, #0090ff44);
-
           &::before {
             width: 6px;
             height: 6px;
@@ -1726,6 +1753,10 @@ onUnmounted(() => {
             border-radius: 3px;
           }
         }
+        .text-red-bold {
+          color: red;
+          font-weight: bold;
+        }
       }
 
       .warning-header {