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

src/views/vent/monitorManager/alarmMonitor/common/measurePoint.vue

@@ -67,6 +67,10 @@
   }>();
 
   const shown = ref('default');
+
+  function switchToDefault() {
+    shown.value = 'default';
+  }
   // const chartsConfig = ref<
   //   {
   //     label: string;
@@ -134,6 +138,10 @@
   //   },
   //   { immediate: true, deep: true }
   // );
+
+  defineExpose({
+    switchToDefault,
+  });
 </script>
 <style lang="less">
   @import '/@/design/theme.less';

src/views/vent/monitorManager/alarmMonitor/warn/gasWarn.vue

@@ -76,7 +76,7 @@
         </div>
 
         <div :class="topAreaListWs.length != 0 ? 'bot-area' : 'bot-area1'">
-          <MeasurePoint title="安全监控测点信息" :timeout="1000" :cards="cardListWs" :charts="chartListWs" />
+          <MeasurePoint ref="measurePointRef" title="安全监控测点信息" :timeout="1000" :cards="cardListWs" :charts="chartListWs" />
         </div>
       </div>
       <div style="width: 100%; height: 100%" v-else-if="isShow == 'yjzb'">
@@ -120,6 +120,8 @@
   let activeIndex = ref(0);
   let isShow = ref('yjjc');
 
+  const measurePointRef = ref<MeasurePoint>(null);
+
   // https获取监测数据
   let timer: null | NodeJS.Timeout = null;
   function getMonitor(deviceID, flag?) {
@@ -239,7 +241,9 @@
   //菜单选项切换
   function cardClick(ind, item) {
     activeIndex1.value = ind;
+    chartListWs.length = 0;
     clearTimeout(timer);
+    measurePointRef.value?.switchToDefault();
     getMonitor(item.deviceID, true);
   }
 

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

@@ -17,7 +17,15 @@
       </a-row>
     </div>
     <div class="content-area">
-      <a-table v-if="columns.length > 0" :columns="columns" :data-source="tableData" size="small" class="tableW" :scroll="{ y: 300 }">
+      <a-table
+        v-if="columns.length > 0"
+        :columns="columns"
+        :data-source="tableData"
+        size="small"
+        :pagination="false"
+        class="tableW"
+        :scroll="{ y: 620 }"
+      >
         <template #bodyCell="{ column, record }">
           <a v-if="column.dataIndex === 'operation'" class="table-action-link" @click="handlerLocation(record)">定位</a>
         </template>
@@ -27,157 +35,157 @@
 </template>
 
 <script setup lang="ts">
-  import { ref, onMounted, reactive, watch } from 'vue';
-  import { bundleColumns } from './comment.data';
-  import { getInfoList, getAllFileList } from './comment.api';
-  // import 'ant-design-vue/dist/antd.css'; // 引入样式
-  const emit = defineEmits(['locate']);
-  const props = defineProps({
-    isShowAction: {
-      type: Boolean,
-      default: false,
-    },
-  });
-  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);
-  const columns = ref([]);
-  watch(
-    () => props.isShowAction,
-    (value) => {
-      if (value) {
-        bundleColumns.push({
-          title: '操作',
-          dataIndex: 'operation',
-          width: 100,
-          align: 'center',
-        });
-        if (columns.value.length == 0) columns.value = bundleColumns;
-      } else {
-        if (columns.value.length == 0) columns.value = bundleColumns;
-      }
-    },
-    { immediate: true }
-  );
-  function handlerLocation(record) {
-    emit('locate', record);
-  }
+import { ref, onMounted, reactive, watch } from 'vue';
+import { bundleColumns } from './comment.data';
+import { getInfoList, getAllFileList } from './comment.api';
+// import 'ant-design-vue/dist/antd.css'; // 引入样式
+const emit = defineEmits(['locate']);
+const props = defineProps({
+  isShowAction: {
+    type: Boolean,
+    default: false,
+  },
+});
+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);
+const columns = ref([]);
+watch(
+  () => props.isShowAction,
+  (value) => {
+    if (value) {
+      bundleColumns.push({
+        title: '操作',
+        dataIndex: 'operation',
+        width: 100,
+        align: 'center',
+      });
+      if (columns.value.length == 0) columns.value = bundleColumns;
+    } else {
+      if (columns.value.length == 0) columns.value = bundleColumns;
+    }
+  },
+  { immediate: true }
+);
+function handlerLocation(record) {
+  emit('locate', record);
+}
 
-  //获取束管日报
-  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 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>

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

@@ -17,7 +17,15 @@
       </a-row>
     </div>
     <div class="content-area">
-      <a-table v-if="columns.length > 0" :columns="columns" :data-source="tableData" size="small" class="tableW" :scroll="{ y: 250 }">
+      <a-table
+        v-if="columns.length > 0"
+        :columns="columns"
+        :data-source="tableData"
+        size="small"
+        :pagination="false"
+        class="tableW"
+        :scroll="{ y: 620 }"
+      >
         <template #bodyCell="{ column, record }">
           <a v-if="column.dataIndex === 'operation'" class="table-action-link" @click="handlerLocation(record)">定位</a>
         </template>
@@ -27,153 +35,153 @@
 </template>
 
 <script setup lang="ts">
-  import { ref, onMounted, reactive, watch } from 'vue';
-  import { bundleSpycolumns } from './comment.data';
-  import { getInfoList, getAllFileList } from './comment.api';
-  // import 'ant-design-vue/dist/antd.css'; // 引入样式
-  const emit = defineEmits(['locate']);
-  const props = defineProps({
-    isShowAction: {
-      type: Boolean,
-      default: false,
-    },
-  });
-  const columns = ref([]);
-  watch(
-    () => props.isShowAction,
-    (value) => {
-      if (value) {
-        bundleSpycolumns.push({
-          title: '操作',
-          dataIndex: 'operation',
-          width: 100,
-          align: 'center',
-        });
-        if (columns.value.length == 0) columns.value = bundleSpycolumns;
-      } else {
-        if (columns.value.length == 0) columns.value = bundleSpycolumns;
-      }
-    },
-    { immediate: true }
-  );
+import { ref, onMounted, reactive, watch } from 'vue';
+import { bundleSpycolumns } from './comment.data';
+import { getInfoList, getAllFileList } from './comment.api';
+// import 'ant-design-vue/dist/antd.css'; // 引入样式
+const emit = defineEmits(['locate']);
+const props = defineProps({
+  isShowAction: {
+    type: Boolean,
+    default: false,
+  },
+});
+const columns = ref([]);
+watch(
+  () => props.isShowAction,
+  (value) => {
+    if (value) {
+      bundleSpycolumns.push({
+        title: '操作',
+        dataIndex: 'operation',
+        width: 100,
+        align: 'center',
+      });
+      if (columns.value.length == 0) columns.value = bundleSpycolumns;
+    } else {
+      if (columns.value.length == 0) columns.value = bundleSpycolumns;
+    }
+  },
+  { immediate: true }
+);
 
-  let selectList = ref<any[]>([]);
+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);
+}
+function handlerLocation(record) {
+  emit('locate', record);
+}
+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);
-  }
-  function handlerLocation(record) {
-    emit('locate', record);
-  }
-  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>

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

@@ -17,7 +17,15 @@
       </a-row>
     </div>
     <div class="content-area">
-      <a-table v-if="columns.length > 0" :columns="columns" :data-source="tableData" size="small" class="tableW" :scroll="{ y: 250 }">
+      <a-table
+        v-if="columns.length > 0"
+        :columns="columns"
+        :data-source="tableData"
+        :pagination="false"
+        size="small"
+        class="tableW"
+        :scroll="{ y: 620 }"
+      >
         <template #bodyCell="{ column, record }">
           <a v-if="column.dataIndex === 'operation'" class="table-action-link" @click="handlerLocation(record)">定位</a>
         </template>