更新

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

@@ -222,7 +222,7 @@ export const iconsMonitor = reactive({
     closeCount: 0,
   },
   bundletube: {
-    url: getThemifyImagesURL('vent/alarm-icons/cf.png'),
+    url: getThemifyImagesURL('vent/alarm-icons/shug.png'),
     // level: 100,
     text: '',
     allText: '总数',

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

@@ -14,9 +14,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive,onMounted, watch, onUnmounted, } from 'vue';
-import {queryNowGasSta} from '../deviceMonitor/components/device/device.api';
-import {  message,} from 'ant-design-vue';
+import { ref, reactive, onMounted, watch, onUnmounted, } from 'vue';
+import { queryNowGasSta } from '../deviceMonitor/components/device/device.api';
+import { message, } from 'ant-design-vue';
 let props = defineProps({
     gasSearch: {
         type: Object,
@@ -27,14 +27,14 @@ let props = defineProps({
 })
 
 const inspectJd = ref<any>('');
-    const inspectList = reactive<any[]>([
+const inspectList = reactive<any[]>([
     { label: '第一次巡检已检数', val: 0 },
     { label: '第一次巡检未检数', val: 0 },
     { label: '第二次巡检已检数', val: 0 },
     { label: '第二次巡检未检数', val: 0 },
 ]);
 
-async function getGasSta(param){
+async function getGasSta(param) {
     if (!param.insType) {
         message.warning('请选择巡检类型!');
     } else if (!param.class) {
@@ -51,10 +51,10 @@ async function getGasSta(param){
         }
     }
 }
-watch(()=>props.gasSearch,(newG,oldG)=>{
-    console.log(newG,'nreG--------')
-    getGasSta(newG)
-},{immediate:true,deep:true})
+watch(() => props.gasSearch, (newV, oldV) => {
+    console.log(newV, 'newV---')
+    getGasSta(newV)
+}, { immediate: true, deep: true })
 onMounted(() => { });
 </script>
 

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

@@ -1,21 +1,17 @@
 <template>
   <div class="scene-box">
     <!-- <div class="top-header">智能通风管理系统</div> -->
-    <div class="select-node" :class="{ 'node-select-show': !treeShow, 'node-select-hide': treeShow }" @click="showTree('treeShow', true)">
+    <div class="select-node" :class="{ 'node-select-show': !treeShow, 'node-select-hide': treeShow }"
+      @click="showTree('treeShow', true)">
       <SvgIcon class="is-expansion-icon put-away-icon" size="38" name="expansion" />
       <span class="title">{{ treeNodeTitle }}</span>
     </div>
     <div class="device-select" :class="{ 'device-select-show': treeShow, 'device-select-hide': !treeShow }">
-      <SvgIcon class="is-expansion-icon expansion-icon" size="28" name="put-away" @click="showTree('treeShow', false)" />
+      <SvgIcon class="is-expansion-icon expansion-icon" size="28" name="put-away"
+        @click="showTree('treeShow', false)" />
       <div class="device-select-box">
-        <a-tree
-          :show-line="true"
-          :tree-data="treeData"
-          v-model:selectedKeys="selectedKeys"
-          :autoExpandParent="true"
-          v-model:expandedKeys="expandedKeys"
-          @select="onSelect"
-        >
+        <a-tree :show-line="true" :tree-data="treeData" v-model:selectedKeys="selectedKeys" :autoExpandParent="true"
+          v-model:expandedKeys="expandedKeys" @select="onSelect">
         </a-tree>
       </div>
     </div>
@@ -23,15 +19,14 @@
     <div v-if="deviceType.startsWith('gasDay_normal') && activeKey == '1'" class="inspect-info-xj">
       <gasInspectDialog :gasSearch="gasSearch"></gasInspectDialog>
     </div>
-    <div
-      class="location-icon"
+    <div class="location-icon"
       :class="{ 'location-btn-show': !locationSettingShow, 'location-btn-hide': locationSettingShow }"
-      @click="showTree('location', true)"
-    >
+      @click="showTree('location', true)">
       <SvgIcon size="18" name="put-away" />
       <span class="location-text">定位图标显示</span>
     </div>
-    <div class="location-select" :class="{ 'location-select-show': locationSettingShow, 'location-select-hide': !locationSettingShow }">
+    <div class="location-select"
+      :class="{ 'location-select-show': locationSettingShow, 'location-select-hide': !locationSettingShow }">
       <div class="location-select-box">
         <div class="location-top-title" @click="showTree('location', false)">
           <SvgIcon class="is-expansion-icon location-expansion-icon" size="28" name="expansion" />
@@ -55,13 +50,8 @@
         </div>
       </div>
     </div>
-    <div
-      class="tabs-box bottom-tabs-box"
-      :class="{ 'table-hide': !tableShow, 'table-show': tableShow }"
-      style="height: 290px"
-      @mousedown="setDivHeight($event, 230, scroll, 0)"
-      id="monitorBox"
-    >
+    <div class="tabs-box bottom-tabs-box" :class="{ 'table-hide': !tableShow, 'table-show': tableShow }"
+      style="height: 290px" @mousedown="setDivHeight($event, 230, scroll, 0)" id="monitorBox">
       <div :style="`padding: 5px; height: ${scroll.y + 100}px`">
         <div class="to-small">
           <div class="to-home" @click="toHome"></div>
@@ -69,16 +59,12 @@
         </div>
         <div class="device-button-group" v-if="deviceList.length > 0">
           <!-- 关联设备 -->
-          <div
-            class="device-button"
-            :class="{ 'device-active': deviceActive == device.deviceType }"
-            v-for="(device, index) in deviceList"
-            :key="index"
-            @click="monitorChange(index)"
-            >{{ device.deviceName }}
+          <div class="device-button" :class="{ 'device-active': deviceActive == device.deviceType }"
+            v-for="(device, index) in deviceList" :key="index" @click="monitorChange(index)">{{ device.deviceName }}
           </div>
           <!-- 场景详情进入 -->
-          <div v-if="haveSysDetailArr.find((item) => deviceType.startsWith(item))" class="enter-detail" @click.stop="goDetail()">
+          <div v-if="haveSysDetailArr.find((item) => deviceType.startsWith(item))" class="enter-detail"
+            @click.stop="goDetail()">
             <send-outlined />
             {{ treeNodeTitle }}详情
           </div>
@@ -139,21 +125,16 @@
           <FullscreenExitOutlined style="font-size: 18px" />
         </div>
         <!-- 是人员定位表单代码，由于放在tab中，表格对已知刷新，导致表单数据也在刷寻，造成输入一半的中文时会清空输入框的内容，导致的输入不上数据 -->
-        <div v-if="deviceType.startsWith('location') && activeKey == '1'" class="location-form" style="position: absolute; z-index: 9999; top: 50px">
+        <div v-if="deviceType.startsWith('location') && activeKey == '1'" class="location-form"
+          style="position: absolute; z-index: 9999; top: 50px">
           <div class="location-form-item">
             <span class="location-form-label">人员名称:</span>
             <Input style="width: 200px" v-model:value="locationForm.strname" />
           </div>
           <div class="location-form-item">
             <span class="location-form-label">所属部门:</span>
-            <MTreeSelect
-              style="width: 200px"
-              v-model:value="locationForm.department"
-              placeholder="请选择所属部门"
-              api="/monitor/getDepartmentInfo"
-              :virtual="false"
-              :isGetPopupContainer="false"
-            />
+            <MTreeSelect style="width: 200px" v-model:value="locationForm.department" placeholder="请选择所属部门"
+              api="/monitor/getDepartmentInfo" :virtual="false" :isGetPopupContainer="false" />
           </div>
           <div class="location-form-item">
             <span class="location-form-label">分站名称:</span>
@@ -161,91 +142,68 @@
           </div>
         </div>
         <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange" id="tabsBox">
-          <a-tab-pane
-            key="1"
-            :tab="
-              deviceType.startsWith('gasDay_normal')
-                ? '当日巡检监测'
-                : deviceType.startsWith('dustDayReport') ||
-                  deviceType.startsWith('dustDayReport') ||
-                  deviceType.startsWith('bundleDayReport') ||
-                  deviceType.startsWith('bundleSpyDayReport')
-                ? '最新监测报表'
-                : '实时监测'
-            "
-          >
-            <template v-if="(deviceType.startsWith('fanlocal') || deviceType.startsWith('fanmain')) && activeKey == '1'">
-              <GroupMonitorTable
-                ref="MonitorDataTable"
-                :dataSource="dataSource"
-                :columnsType="`${deviceType}_monitor`"
-                :scroll="scroll"
-                :isAction="true"
-                :isShowSelect="false"
-              >
+          <a-tab-pane key="1" :tab="deviceType.startsWith('gasDay_normal')
+            ? '当日巡检监测'
+            : deviceType.startsWith('dustDayReport') ||
+              deviceType.startsWith('dustDayReport') ||
+              deviceType.startsWith('bundleDayReport') ||
+              deviceType.startsWith('bundleSpyDayReport')
+              ? '最新监测报表'
+              : '实时监测'
+            ">
+            <template
+              v-if="(deviceType.startsWith('fanlocal') || deviceType.startsWith('fanmain')) && activeKey == '1'">
+              <GroupMonitorTable ref="MonitorDataTable" :dataSource="dataSource" :columnsType="`${deviceType}_monitor`"
+                :scroll="scroll" :isAction="true" :isShowSelect="false">
                 <template #action="{ record }">
-                  <TableAction
-                    :actions="
-                      haveDetailArr.find((item) => deviceType.startsWith(item))
-                        ? [
-                            {
-                              label: '详情',
-                              onClick: goDetail.bind(null, record),
-                            },
-                            {
-                              label: '定位',
-                              onClick: goLocation.bind(null, record),
-                            },
-                          ]
-                        : [
-                            {
-                              label: '定位',
-                              onClick: goLocation.bind(null, record),
-                            },
-                          ]
-                    "
-                  />
+                  <TableAction :actions="haveDetailArr.find((item) => deviceType.startsWith(item))
+                    ? [
+                      {
+                        label: '详情',
+                        onClick: goDetail.bind(null, record),
+                      },
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
+                    : [
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
+                    " />
                 </template>
               </GroupMonitorTable>
             </template>
             <template v-else-if="deviceType == 'majorpath' && activeKey == '1'">
-              <a-table :columns="majorColumns" :data-source="dataSource" bordered :scroll="{ y: scroll.y - 30 }" :pagination="false"></a-table>
+              <a-table :columns="majorColumns" :data-source="dataSource" bordered :scroll="{ y: scroll.y - 30 }"
+                :pagination="false"></a-table>
             </template>
             <template v-else-if="deviceType.startsWith('safetymonitor') && activeKey == '1'">
-              <MonitorTable
-                ref="monitorTable"
-                :columnsType="`${deviceType}_monitor`"
-                :deviceType="deviceType"
-                :dataSource="dataSource"
-                design-scope="device_monitor"
-                :isShowActionColumn="true"
-                :isShowSelect="false"
-                title="设备监测"
-                :form-config="formConfig"
-                :scroll="{ y: scroll.y - 110 }"
-              >
+              <MonitorTable ref="monitorTable" :columnsType="`${deviceType}_monitor`" :deviceType="deviceType"
+                :dataSource="dataSource" design-scope="device_monitor" :isShowActionColumn="true" :isShowSelect="false"
+                title="设备监测" :form-config="formConfig" :scroll="{ y: scroll.y - 110 }">
                 <template #action="{ record }">
-                  <TableAction
-                    :actions="
-                      haveDetailArr.find((item) => deviceType.startsWith(item))
-                        ? [
-                            {
-                              label: '详情',
-                              onClick: goDetail.bind(null, record),
-                            },
-                            {
-                              label: '定位',
-                              onClick: goLocation.bind(null, record),
-                            },
-                          ]
-                        : [
-                            {
-                              label: '定位',
-                              onClick: goLocation.bind(null, record),
-                            },
-                          ]
-                    "
-                  />
+                  <TableAction :actions="haveDetailArr.find((item) => deviceType.startsWith(item))
+                    ? [
+                      {
+                        label: '详情',
+                        onClick: goDetail.bind(null, record),
+                      },
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
+                    : [
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
+                    " />
                 </template>
                 <template #filterCell="{ column, record }">
                   <div v-if="!record.devicename && column.dataIndex === 'devicename'">-</div>
@@ -261,52 +219,30 @@
               </MonitorTable>
             </template>
             <template v-else-if="deviceType.startsWith('location') && activeKey == '1'">
-              <MonitorTable
-                ref="monitorTable"
-                :columnsType="`${deviceType}_monitor`"
-                :deviceType="deviceType"
-                :dataSource="dataSource"
-                design-scope="device_monitor"
-                :isShowActionColumn="true"
-                :isShowSelect="false"
-                title="设备监测"
-                :scroll="{ y: scroll.y - 110 }"
-                style="margin-top: 60px"
-              >
+              <MonitorTable ref="monitorTable" :columnsType="`${deviceType}_monitor`" :deviceType="deviceType"
+                :dataSource="dataSource" design-scope="device_monitor" :isShowActionColumn="true" :isShowSelect="false"
+                title="设备监测" :scroll="{ y: scroll.y - 110 }" style="margin-top: 60px">
                 <template v-if="!noLocationList.includes('location')" #action="{ record }">
-                  <TableAction
-                    :actions="[
-                      {
-                        label: '定位',
-                        onClick: goLocation.bind(null, record),
-                      },
-                    ]"
-                  />
+                  <TableAction :actions="[
+                    {
+                      label: '定位',
+                      onClick: goLocation.bind(null, record),
+                    },
+                  ]" />
                 </template>
               </MonitorTable>
             </template>
             <template v-else-if="deviceType.startsWith('vehicle') && activeKey == '1'">
-              <MonitorTable
-                ref="monitorTable"
-                :columnsType="`${deviceType}_monitor`"
-                :deviceType="deviceType"
-                :dataSource="dataSource"
-                design-scope="device_monitor"
-                :isShowActionColumn="true"
-                :isShowSelect="false"
-                title="设备监测"
-                :form-config="vehicleFormConfig"
-                :scroll="{ y: scroll.y - 110 }"
-              >
+              <MonitorTable ref="monitorTable" :columnsType="`${deviceType}_monitor`" :deviceType="deviceType"
+                :dataSource="dataSource" design-scope="device_monitor" :isShowActionColumn="true" :isShowSelect="false"
+                title="设备监测" :form-config="vehicleFormConfig" :scroll="{ y: scroll.y - 110 }">
                 <template v-if="!noLocationList.includes('location')" #action="{ record }">
-                  <TableAction
-                    :actions="[
-                      {
-                        label: '定位',
-                        onClick: goLocation.bind(null, record),
-                      },
-                    ]"
-                  />
+                  <TableAction :actions="[
+                    {
+                      label: '定位',
+                      onClick: goLocation.bind(null, record),
+                    },
+                  ]" />
                 </template>
               </MonitorTable>
             </template>
@@ -356,10 +292,12 @@
               <gaspatrolTable ref="gaspatrol" @getSearch="getSearch" @locate="goLocation"> </gaspatrolTable>
             </template>
             <!-- 瓦斯日报 -->
-            <template v-else-if="deviceType.startsWith('gasDayReport') && activeKey == '1' && glob.sysOrgCode != 'sdmtjtbetmk'">
+            <template
+              v-else-if="deviceType.startsWith('gasDayReport') && activeKey == '1' && glob.sysOrgCode != 'sdmtjtbetmk'">
               <gasReport ref="gasreport" @locate="goLocation"> </gasReport>
             </template>
-            <template v-else-if="deviceType.startsWith('gasDayReport') && activeKey == '1' && glob.sysOrgCode == 'sdmtjtbetmk'">
+            <template
+              v-else-if="deviceType.startsWith('gasDayReport') && activeKey == '1' && glob.sysOrgCode == 'sdmtjtbetmk'">
               <gasReportCount ref="gasreportcount" @locate="goLocation"> </gasReportCount>
             </template>
             <!-- 粉尘监测报表-->
@@ -381,99 +319,70 @@
             </template>
             <template v-else>
               <!-- 工作面echarts图标 -->
-              <BarAndLine
-                v-if="activeKey == '1' && deviceType == 'surface_history'"
-                class="echarts-line"
-                xAxisPropType="time"
-                :dataSource="surfaceEchartsData"
-                height="300px"
-                :chartsColumns="surfaceChartsColumns"
-                :option="echatsOption"
-              />
-              <MonitorTable
-                v-else-if="activeKey == '1'"
-                ref="monitorTable"
-                :columnsType="`${deviceType}_monitor`"
-                :dataSource="dataSource"
-                design-scope="device_monitor"
-                :isShowActionColumn="true"
-                :isShowSelect="false"
-                title="设备监测"
-                :scroll="{ y: scroll.y - 30 }"
-              >
+              <BarAndLine v-if="activeKey == '1' && deviceType == 'surface_history'" class="echarts-line"
+                xAxisPropType="time" :dataSource="surfaceEchartsData" height="300px"
+                :chartsColumns="surfaceChartsColumns" :option="echatsOption" />
+              <MonitorTable v-else-if="activeKey == '1'" 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="
-                      haveDetailArr.find((item) => deviceType.startsWith(item))
-                        ? [
-                            {
-                              label: '详情',
-                              onClick: goDetail.bind(null, record),
-                            },
-                            {
-                              label: '定位',
-                              onClick: goLocation.bind(null, record),
-                            },
-                          ]
-                        : [
-                            {
-                              label: '定位',
-                              onClick: goLocation.bind(null, record),
-                            },
-                          ]
-                    "
-                  />
+                  <TableAction :actions="haveDetailArr.find((item) => deviceType.startsWith(item))
+                    ? [
+                      {
+                        label: '详情',
+                        onClick: goDetail.bind(null, record),
+                      },
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
+                    : [
+                      {
+                        label: '定位',
+                        onClick: goLocation.bind(null, record),
+                      },
+                    ]
+                    " />
                 </template>
                 <template #filterCell="{ column, record }">
                   <template v-if="deviceType.startsWith('gate') || deviceType.startsWith('door')">
-                    <a-tag v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '0' && record.frontGateClose == '0'" color="red"
-                      >正在运行</a-tag
-                    >
+                    <a-tag
+                      v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '0' && record.frontGateClose == '0'"
+                      color="red">正在运行</a-tag>
                     <a-tag
                       v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '0' && record.frontGateClose == 1"
-                      color="default"
-                      >关闭</a-tag
-                    >
+                      color="default">关闭</a-tag>
                     <a-tag
                       v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '1' && record.frontGateClose == '0'"
-                      color="#46C66F"
-                      >打开</a-tag
-                    >
+                      color="#46C66F">打开</a-tag>
                     <a-tag
                       v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == '1' && record.frontGateClose == '1'"
-                      color="#FF0000"
-                      >点位异常</a-tag
-                    >
-                    <a-tag v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '0' && record.rearGateClose == '0'" color="red"
-                      >正在运行</a-tag
-                    >
+                      color="#FF0000">点位异常</a-tag>
+                    <a-tag
+                      v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '0' && record.rearGateClose == '0'"
+                      color="red">正在运行</a-tag>
                     <a-tag
                       v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '0' && record.rearGateClose == '1'"
-                      color="default"
-                      >关闭</a-tag
-                    >
+                      color="default">关闭</a-tag>
                     <a-tag
                       v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '1' && record.rearGateClose == '0'"
-                      color="#46C66F"
-                      >打开</a-tag
-                    >
+                      color="#46C66F">打开</a-tag>
                     <a-tag
                       v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == '1' && record.rearGateClose == '1'"
-                      color="#FF0000"
-                      >点位异常</a-tag
-                    >
-                    <a-tag v-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '0' && record.midGateClose == '0'" color="red"
-                      >正在运行</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '0' && record.midGateClose == 1" color="default"
-                      >关闭</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '1' && record.midGateClose == '0'" color="#46C66F"
-                      >打开</a-tag
-                    >
-                    <a-tag v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '1' && record.midGateClose == '1'" color="#FF0000"
-                      >点位异常</a-tag
-                    >
+                      color="#FF0000">点位异常</a-tag>
+                    <a-tag
+                      v-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '0' && record.midGateClose == '0'"
+                      color="red">正在运行</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '0' && record.midGateClose == 1"
+                      color="default">关闭</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '1' && record.midGateClose == '0'"
+                      color="#46C66F">打开</a-tag>
+                    <a-tag
+                      v-else-if="column.dataIndex === 'midGateOpen' && record.midGateOpen == '1' && record.midGateClose == '1'"
+                      color="#FF0000">点位异常</a-tag>
                     <template v-if="column.dataIndex === 'ndoortype'">
                       <span>{{ render.renderDictText(record.ndoortype, 'ndoortype') }}</span>
                     </template>
@@ -482,13 +391,14 @@
                     </template>
                   </template>
                   <template v-else-if="deviceType.startsWith('windrect')">
-                    <a-tag v-if="column.dataIndex === 'sign'" :color="record.sign == 0 ? '#95CF65' : record.sign == 1 ? '#4590EA' : '#9876AA'">
-                      {{ record.sign == 0 ? '高位' : record.sign == 1 ? '中位' : '低位' }}</a-tag
-                    >
+                    <a-tag v-if="column.dataIndex === 'sign'"
+                      :color="record.sign == 0 ? '#95CF65' : record.sign == 1 ? '#4590EA' : '#9876AA'">
+                      {{ record.sign == 0 ? '高位' : record.sign == 1 ? '中位' : '低位' }}</a-tag>
                     <template v-if="record && column && column.dataIndex === 'isRun' && record.isRun">
-                      <a-tag v-if="record.isRun == -2 || record.isRun == -1" :color="record.isRun == -2 ? '#95CF65' : '#ED5700'">{{
-                        record.isRun == -2 ? '空闲' : '等待'
-                      }}</a-tag>
+                      <a-tag v-if="record.isRun == -2 || record.isRun == -1"
+                        :color="record.isRun == -2 ? '#95CF65' : '#ED5700'">{{
+                          record.isRun == -2 ? '空闲' : '等待'
+                        }}</a-tag>
                       <a-tag v-else-if="record.isRun == 100" color="#4693FF">完成</a-tag>
                       <Progress v-else :percent="Number(record.isRun)" size="small" status="active" />
                     </template>
@@ -506,16 +416,19 @@
                     <a-tag v-if="column.dataIndex === 'stateConn' && record.stateConn == '0'" color="red">断开</a-tag>
                   </template>
                   <template v-else-if="deviceType.startsWith('gaspatrol')">
-                    <a-tag v-if="column.dataIndex === 'deviceConnect_str' && record.deviceConnect_str.endsWith('正常')" color="green">{{
-                      record.deviceConnect_str
-                    }}</a-tag>
-                    <a-tag v-if="column.dataIndex === 'deviceConnect_str' && record.deviceConnect_str.endsWith('断开')" color="red">{{
-                      record.deviceConnect_str
-                    }}</a-tag>
+                    <a-tag v-if="column.dataIndex === 'deviceConnect_str' && record.deviceConnect_str.endsWith('正常')"
+                      color="green">{{
+                        record.deviceConnect_str
+                      }}</a-tag>
+                    <a-tag v-if="column.dataIndex === 'deviceConnect_str' && record.deviceConnect_str.endsWith('断开')"
+                      color="red">{{
+                        record.deviceConnect_str
+                      }}</a-tag>
                   </template>
-                  <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
-                  >
+                  <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>
@@ -539,60 +452,42 @@
                 <HistoryBall :dataSource="dataSource"></HistoryBall>
               </template>
               <template v-else-if="deviceType.startsWith('fanmain')">
-                <HistoryTableNew class="w-100% h-100%" :device-code="`${deviceType}`" :scroll="scroll" dict-code="fan_dict" />
+                <HistoryTableNew class="w-100% h-100%" :device-code="`${deviceType}`" :scroll="scroll"
+                  dict-code="fan_dict" />
               </template>
               <template v-else-if="deviceType.startsWith('fanlocal')">
-                <HistoryTableNew class="w-100% h-100%" :device-code="`${deviceType}`" :scroll="scroll" dict-code="fanlocal_dict" />
+                <HistoryTableNew class="w-100% h-100%" :device-code="`${deviceType}`" :scroll="scroll"
+                  dict-code="fanlocal_dict" />
               </template>
               <template v-else>
-                <HistoryTable
-                  ref="historyTable"
-                  :sysId="systemID"
-                  :columns-type="`${deviceType}`"
-                  :device-type="deviceType"
-                  designScope="device-history"
-                  :scroll="scroll"
-                />
+                <HistoryTable ref="historyTable" :sysId="systemID" :columns-type="`${deviceType}`"
+                  :device-type="deviceType" designScope="device-history" :scroll="scroll" />
               </template>
             </div>
           </a-tab-pane>
           <a-tab-pane key="3" tab="报警历史" v-if="!noWarningArr.find((item) => deviceType.startsWith(item))">
             <div class="tab-item">
-              <AlarmHistoryTable
-                ref="alarmHistoryTable"
-                v-if="activeKey == '3'"
-                :sysId="systemID"
-                columns-type="alarm"
+              <AlarmHistoryTable ref="alarmHistoryTable" v-if="activeKey == '3'" :sysId="systemID" columns-type="alarm"
                 :device-type="deviceType"
                 :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, sysId: systemID, pageSize: 10000 })"
-                :scroll="scroll"
-                designScope="alarm-history"
-              />
+                :scroll="scroll" designScope="alarm-history" />
             </div>
           </a-tab-pane>
           <a-tab-pane key="4" tab="操作历史" v-if="haveHandlerArr.find((item) => deviceType.startsWith(item))">
             <div class="tab-item">
-              <HandlerHistoryTable
-                ref="handlerHistoryTable"
-                v-if="activeKey == '4'"
-                :sysId="systemID"
-                columns-type="operator_history"
-                :device-type="deviceType"
+              <HandlerHistoryTable ref="handlerHistoryTable" v-if="activeKey == '4'" :sysId="systemID"
+                columns-type="operator_history" :device-type="deviceType"
                 :device-list-api="getDeviceList.bind(null, { devicekind: deviceType, sysId: systemID })"
-                :scroll="scroll"
-                designScope="operator-history"
-              />
+                :scroll="scroll" designScope="operator-history" />
             </div>
           </a-tab-pane>
         </a-tabs>
       </div>
     </div>
-    <mainPath
-      v-if="deviceType == 'majorpath'"
-      :dataSource="majorPathEchartsData"
-      style="width: 300px; height: 300px; position: absolute; left: 250px; top: 40px"
-    />
-    <component v-if="modalVisible" :is="currentModal" v-model:visible="modalVisible" :dataSource="dataSource" :activeID="activeID" />
+    <mainPath v-if="deviceType == 'majorpath'" :dataSource="majorPathEchartsData"
+      style="width: 300px; height: 300px; position: absolute; left: 250px; top: 40px" />
+    <component v-if="modalVisible" :is="currentModal" v-model:visible="modalVisible" :dataSource="dataSource"
+      :activeID="activeID" />
   </div>
 </template>
 
@@ -655,7 +550,7 @@ const { FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, Gasp
 const props = defineProps({
   pageData: {
     type: Object,
-    default: () => {},
+    default: () => { },
   },
 });
 const { handleExportXls } = useMethods();
@@ -716,13 +611,16 @@ const scroll = reactive({
 const treeData = ref<TreeProps['treeData']>([]);
 let departmentInfo: Null | Object = null;
 let startMonitorTimer = 0;
-
-let gasSearch = reactive({});
 let gaspatrol = ref(null);
 let gasreport = ref(null);
 let gasreportcount = ref(null);
 let station = ref(null);
-
+let gasSearch = reactive({
+  address: '',
+  userName: '',
+  insType: '2',
+  class: 'night',
+});
 //树形菜单选择事件
 const onSelect: TreeProps['onSelect'] = (keys, e) => {
   deviceType.value = '';
@@ -1036,8 +934,10 @@ function goLocation(record) {
   }
 }
 function getSearch(param) {
-  gasSearch = param;
-  console.log(gasSearch);
+  gasSearch.address = param.address,
+    gasSearch.userName = param.userName,
+    gasSearch.insType = param.insType,
+    gasSearch.class = param.class
 }
 // 详情跳转
 function goDetail(record?) {
@@ -2101,5 +2001,4 @@ onUnmounted(() => {
 //   margin-top: 5px !important;
 //   display: flex;
 //   align-items: center;
-// }
-</style>
+// }</style>