diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index a44fe4b..e68145d 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -211,7 +211,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index a44fe4b..e68145d 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -211,7 +211,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index f480f1f..0b95a99 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -22,16 +22,16 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
-  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -166,6 +166,23 @@
     fetchData()
   })
 })
+// 跳转设备详情
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 const { proxy } = getCurrentInstance() as any
 </script>
 
@@ -246,6 +263,15 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
@@ -259,3 +285,18 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
+</style>

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index a44fe4b..e68145d 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -211,7 +211,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index f480f1f..0b95a99 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -22,16 +22,16 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
-  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -166,6 +166,23 @@
     fetchData()
   })
 })
+// 跳转设备详情
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 const { proxy } = getCurrentInstance() as any
 </script>
 
@@ -246,6 +263,15 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
@@ -259,3 +285,18 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 106d488..b68eb45 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -106,7 +106,7 @@
   //   align: 'center',
   // },
   {
-    text: '设备使用状态',
+    text: '设备在用状态',
     value: 'onState',
     align: 'center',
   },

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index a44fe4b..e68145d 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -211,7 +211,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index f480f1f..0b95a99 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -22,16 +22,16 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
-  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -166,6 +166,23 @@
     fetchData()
   })
 })
+// 跳转设备详情
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 const { proxy } = getCurrentInstance() as any
 </script>
 
@@ -246,6 +263,15 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
@@ -259,3 +285,18 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 106d488..b68eb45 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -106,7 +106,7 @@
   //   align: 'center',
   // },
   {
-    text: '设备使用状态',
+    text: '设备在用状态',
     value: 'onState',
     align: 'center',
   },
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index ffe9f93..b9b9421 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -6,14 +6,15 @@
 <script lang="ts" setup name="infoWindow">
 import { getPipelineDetail } from '@/api/home/pipeline/pipeline'
 import { getGasData } from '@/api/home/well/well'
-import gasDialog from '@/views/home/well/components/gasDialog.vue'
+// import gasDialog from '@/views/home/well/components/gasDialog.vue'
+import gasDialog from './gasDataDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 // 基本数据
 const baseInfo = ref({
   deviceTypeName: '', // 场站编号
-  deviceCode: '', // 场站名称
+  deviceCode: '' // 场站名称
 })
 const loading = ref(true)
 // 详细信息
@@ -23,73 +24,73 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '厂商',
     value: 'manufactureName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '压力级制',
     value: 'pressType',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '材质',
     value: 'material',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '建设年代',
     value: 'constructEra',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '安装位号',
     value: 'tagNumber',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '负责人',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '在用状态',
     value: 'onState',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
-    value: 'monitorState',
-    align: 'center',
+    value: 'monitorStateName',
+    align: 'center'
   },
   {
     text: '设备运行状态',
     value: 'status',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '设备编号',
   //   value: 'devcode',
@@ -110,7 +111,6 @@
   //   value: 'manageType',
   //   align: 'center',
   // },
-
 ])
 // 初始化
 const gasData = ref<any[]>([])
@@ -128,52 +128,85 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
-    if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+  gasData.value = []
+  if (
+    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName.includes('管网哨兵') ||
+    rowData.value.deviceTypeName.includes('智能警示桩')
+  ) {
+    // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
-      align: 'center',
+      align: 'center'
     })
-  }
-  else {
-    descriptionsList.value = descriptionsList.value.filter((item: any) => item.text !== '燃气浓度')
+  } else {
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
   }
   console.log(e.info.row, 'e.info.row')
   getPipelineDetail({
     id: e.info.row.id,
-    devcode: e.info.row.deviceCode,
-  }).then((res) => {
-    loading.value = false
-    detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
-      return
-    }
-    gasData.value = []
-    // 获取燃气浓度
-    getGasData({
-      wellId: rowData.value.id,
-      devCode: rowData.value.deviceCode,
-    }).then((res) => {
-      // console.log(res.data, '123321')
-      for (const i in res.data) {
-        if (i.includes('燃气')) {
-          // console.log(i, 'iiiiiiiii')
-          gasData.value.push({
-            name: i,
-            devcode: res.data[i].devcode,
-            state: res.data[i].state,
-            value: res.data[i].value,
-            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') ? '%LEL' : '',
-            stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
-          })
-        }
-      }
-    })
-  }).catch(() => {
-    loading.value = false
+    devcode: e.info.row.deviceCode
   })
+    .then(res => {
+      loading.value = false
+      detailInfo.value = res.data
+      if (
+        !(
+          rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+          rowData.value.deviceTypeName.includes('管网哨兵') ||
+          rowData.value.deviceTypeName.includes('智能警示桩')
+        )
+      ) {
+        return
+      }
+
+      // 获取燃气浓度
+      getGasData({
+        wellId: rowData.value.id,
+        devCode: rowData.value.deviceCode
+      }).then(res => {
+        // console.log(res.data, '123321')
+        for (const i in res.data) {
+          if (i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')) {
+            // console.log(i, 'iiiiiiiii')
+            gasData.value.push({
+              name: i,
+              devcode: res.data[i].devcode,
+              state: res.data[i].state,
+              value: res.data[i].value || '0.00',
+              text:
+                i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')
+                  ? '燃气浓度'
+                  : i.includes('液位')
+                  ? '液位状态'
+                  : i.includes('井盖')
+                  ? '井盖状态'
+                  : '',
+              unit: i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩') ? '%LEL' : '',
+              stateName:
+                res.data[i].state === '1'
+                  ? '正常'
+                  : res.data[i].state === '0'
+                  ? '离线'
+                  : res.data[i].state === '2'
+                  ? '报警'
+                  : ''
+            })
+          }
+        }
+        console.log(gasData.value, 'gasData.value')
+        gasData.value = gasData.value.filter(item => item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName))
+      })
+    })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -188,30 +221,39 @@
     query: {
       id: rowData.value.id,
       deviceCode: rowData.value.deviceCode,
-      typeName: rowData.value.deviceTypeName,
-    },
+      typeName: rowData.value.deviceTypeName
+    }
   })
 }
 // 燃气数据-更多
 const gasRef = ref()
 const more = () => {
-  gasRef.value.initDialog(rowData.value.id)
+  // detailInfo.value
+  gasRef.value.initDialog(rowData.value)
 }
 defineExpose({ initDialog, close })
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+  <div
+    v-show="dialogFormVisible"
+    class="container clearfix"
+    @mouseleave="() => {}"
+  >
     <gas-dialog ref="gasRef" />
     <div class="header">
-      <div style="display: flex;align-items: center;">
+      <div style="display: flex; align-items: center">
         <el-tooltip
-          class="box-item" effect="dark" :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
+          class="box-item"
+          effect="dark"
+          :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
           placement="top"
         >
-          <span class="title">{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }} </span>
+          <span class="title"
+            >{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }}
+          </span>
         </el-tooltip>
-        <el-button style="margin-left: 10px;" size="small" @click="goDetail">
+        <el-button style="margin-left: 10px" size="small" @click="goDetail">
           详情
         </el-button>
       </div>
@@ -219,22 +261,102 @@
     </div>
     <div class="body">
       <div class="descriptions">
-        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
-          <div class="label">
+        <div
+          v-for="item in descriptionsList"
+          :key="item.text"
+          class="descriptions-item"
+          :class="item.text === '燃气浓度' ? 'last-value' : ''"
+        >
+          <div
+            class="label"
+            :class="item.text === '燃气浓度' ? 'last-label' : ''"
+          >
             {{ item.text }}
           </div>
-          <div v-if="item.text !== '燃气浓度'" class="value" :title="detailInfo[item.value] || ''">
+          <div
+            v-if="
+              item.text !== '燃气浓度' &&
+              item.text !== '监控状态' &&
+              item.text !== '设备运行状态'
+            "
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
             {{ detailInfo[item.value] || '' }}
           </div>
+          <!-- 设备运行状态 -->
+          <div
+            v-if="item.text === '设备运行状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+          >
+            <span
+              style="margin-left: 10px"
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : ''
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
+          <!-- 监控状态 -->
+          <div
+            v-if="item.text === '监控状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
+            <span
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : detailInfo[item.value] === '未监控'
+                    ? '#a39f9f'
+                    : '#a39f9f'
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
 
-          <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
+          <!-- 燃气浓度 -->
+          <div
+            v-if="item.text === '燃气浓度' && gasData.length"
+            class="value"
+            style="width: 80%;margin-left: 10px;"
+          >
             <div v-for="item in gasData" v-show="item.text" :key="item.name">
-              {{ item.text }} :
-              <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
-                : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
-              }}</span>
-              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
+              {{ item.name }} :
+              <span :class="`${item.state === '1' ? '' : 'error'}`">
+                {{
+                  item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')
+                    ? item.value
+                    : item.stateName
+                }}</span
+              >
+              <span
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                :class="`${item.state === '1' ? '' : 'error'}`"
+              >
+                {{ item.unit }}</span
+              >
+              <el-button
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                size="small"
+                style="margin-left: 10px"
+                @click="more"
+              >
                 更多
               </el-button>
             </div>
@@ -301,7 +423,9 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
-
+      .last-value {
+        width: 100% !important;
+      }
       .descriptions-item {
         width: 48%;
         margin: 4px 5px;
@@ -312,7 +436,9 @@
         .label-no {
           width: 28% !important;
         }
-
+        .last-label {
+          width: 16% !important;
+        }
         .label {
           width: 34%;
           box-sizing: border-box;

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index a44fe4b..e68145d 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -211,7 +211,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index f480f1f..0b95a99 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -22,16 +22,16 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
-  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -166,6 +166,23 @@
     fetchData()
   })
 })
+// 跳转设备详情
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 const { proxy } = getCurrentInstance() as any
 </script>
 
@@ -246,6 +263,15 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
@@ -259,3 +285,18 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 106d488..b68eb45 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -106,7 +106,7 @@
   //   align: 'center',
   // },
   {
-    text: '设备使用状态',
+    text: '设备在用状态',
     value: 'onState',
     align: 'center',
   },
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index ffe9f93..b9b9421 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -6,14 +6,15 @@
 <script lang="ts" setup name="infoWindow">
 import { getPipelineDetail } from '@/api/home/pipeline/pipeline'
 import { getGasData } from '@/api/home/well/well'
-import gasDialog from '@/views/home/well/components/gasDialog.vue'
+// import gasDialog from '@/views/home/well/components/gasDialog.vue'
+import gasDialog from './gasDataDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 // 基本数据
 const baseInfo = ref({
   deviceTypeName: '', // 场站编号
-  deviceCode: '', // 场站名称
+  deviceCode: '' // 场站名称
 })
 const loading = ref(true)
 // 详细信息
@@ -23,73 +24,73 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '厂商',
     value: 'manufactureName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '压力级制',
     value: 'pressType',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '材质',
     value: 'material',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '建设年代',
     value: 'constructEra',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '安装位号',
     value: 'tagNumber',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '负责人',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '在用状态',
     value: 'onState',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
-    value: 'monitorState',
-    align: 'center',
+    value: 'monitorStateName',
+    align: 'center'
   },
   {
     text: '设备运行状态',
     value: 'status',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '设备编号',
   //   value: 'devcode',
@@ -110,7 +111,6 @@
   //   value: 'manageType',
   //   align: 'center',
   // },
-
 ])
 // 初始化
 const gasData = ref<any[]>([])
@@ -128,52 +128,85 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
-    if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+  gasData.value = []
+  if (
+    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName.includes('管网哨兵') ||
+    rowData.value.deviceTypeName.includes('智能警示桩')
+  ) {
+    // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
-      align: 'center',
+      align: 'center'
     })
-  }
-  else {
-    descriptionsList.value = descriptionsList.value.filter((item: any) => item.text !== '燃气浓度')
+  } else {
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
   }
   console.log(e.info.row, 'e.info.row')
   getPipelineDetail({
     id: e.info.row.id,
-    devcode: e.info.row.deviceCode,
-  }).then((res) => {
-    loading.value = false
-    detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
-      return
-    }
-    gasData.value = []
-    // 获取燃气浓度
-    getGasData({
-      wellId: rowData.value.id,
-      devCode: rowData.value.deviceCode,
-    }).then((res) => {
-      // console.log(res.data, '123321')
-      for (const i in res.data) {
-        if (i.includes('燃气')) {
-          // console.log(i, 'iiiiiiiii')
-          gasData.value.push({
-            name: i,
-            devcode: res.data[i].devcode,
-            state: res.data[i].state,
-            value: res.data[i].value,
-            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') ? '%LEL' : '',
-            stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
-          })
-        }
-      }
-    })
-  }).catch(() => {
-    loading.value = false
+    devcode: e.info.row.deviceCode
   })
+    .then(res => {
+      loading.value = false
+      detailInfo.value = res.data
+      if (
+        !(
+          rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+          rowData.value.deviceTypeName.includes('管网哨兵') ||
+          rowData.value.deviceTypeName.includes('智能警示桩')
+        )
+      ) {
+        return
+      }
+
+      // 获取燃气浓度
+      getGasData({
+        wellId: rowData.value.id,
+        devCode: rowData.value.deviceCode
+      }).then(res => {
+        // console.log(res.data, '123321')
+        for (const i in res.data) {
+          if (i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')) {
+            // console.log(i, 'iiiiiiiii')
+            gasData.value.push({
+              name: i,
+              devcode: res.data[i].devcode,
+              state: res.data[i].state,
+              value: res.data[i].value || '0.00',
+              text:
+                i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')
+                  ? '燃气浓度'
+                  : i.includes('液位')
+                  ? '液位状态'
+                  : i.includes('井盖')
+                  ? '井盖状态'
+                  : '',
+              unit: i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩') ? '%LEL' : '',
+              stateName:
+                res.data[i].state === '1'
+                  ? '正常'
+                  : res.data[i].state === '0'
+                  ? '离线'
+                  : res.data[i].state === '2'
+                  ? '报警'
+                  : ''
+            })
+          }
+        }
+        console.log(gasData.value, 'gasData.value')
+        gasData.value = gasData.value.filter(item => item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName))
+      })
+    })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -188,30 +221,39 @@
     query: {
       id: rowData.value.id,
       deviceCode: rowData.value.deviceCode,
-      typeName: rowData.value.deviceTypeName,
-    },
+      typeName: rowData.value.deviceTypeName
+    }
   })
 }
 // 燃气数据-更多
 const gasRef = ref()
 const more = () => {
-  gasRef.value.initDialog(rowData.value.id)
+  // detailInfo.value
+  gasRef.value.initDialog(rowData.value)
 }
 defineExpose({ initDialog, close })
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+  <div
+    v-show="dialogFormVisible"
+    class="container clearfix"
+    @mouseleave="() => {}"
+  >
     <gas-dialog ref="gasRef" />
     <div class="header">
-      <div style="display: flex;align-items: center;">
+      <div style="display: flex; align-items: center">
         <el-tooltip
-          class="box-item" effect="dark" :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
+          class="box-item"
+          effect="dark"
+          :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
           placement="top"
         >
-          <span class="title">{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }} </span>
+          <span class="title"
+            >{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }}
+          </span>
         </el-tooltip>
-        <el-button style="margin-left: 10px;" size="small" @click="goDetail">
+        <el-button style="margin-left: 10px" size="small" @click="goDetail">
           详情
         </el-button>
       </div>
@@ -219,22 +261,102 @@
     </div>
     <div class="body">
       <div class="descriptions">
-        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
-          <div class="label">
+        <div
+          v-for="item in descriptionsList"
+          :key="item.text"
+          class="descriptions-item"
+          :class="item.text === '燃气浓度' ? 'last-value' : ''"
+        >
+          <div
+            class="label"
+            :class="item.text === '燃气浓度' ? 'last-label' : ''"
+          >
             {{ item.text }}
           </div>
-          <div v-if="item.text !== '燃气浓度'" class="value" :title="detailInfo[item.value] || ''">
+          <div
+            v-if="
+              item.text !== '燃气浓度' &&
+              item.text !== '监控状态' &&
+              item.text !== '设备运行状态'
+            "
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
             {{ detailInfo[item.value] || '' }}
           </div>
+          <!-- 设备运行状态 -->
+          <div
+            v-if="item.text === '设备运行状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+          >
+            <span
+              style="margin-left: 10px"
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : ''
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
+          <!-- 监控状态 -->
+          <div
+            v-if="item.text === '监控状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
+            <span
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : detailInfo[item.value] === '未监控'
+                    ? '#a39f9f'
+                    : '#a39f9f'
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
 
-          <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
+          <!-- 燃气浓度 -->
+          <div
+            v-if="item.text === '燃气浓度' && gasData.length"
+            class="value"
+            style="width: 80%;margin-left: 10px;"
+          >
             <div v-for="item in gasData" v-show="item.text" :key="item.name">
-              {{ item.text }} :
-              <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
-                : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
-              }}</span>
-              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
+              {{ item.name }} :
+              <span :class="`${item.state === '1' ? '' : 'error'}`">
+                {{
+                  item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')
+                    ? item.value
+                    : item.stateName
+                }}</span
+              >
+              <span
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                :class="`${item.state === '1' ? '' : 'error'}`"
+              >
+                {{ item.unit }}</span
+              >
+              <el-button
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                size="small"
+                style="margin-left: 10px"
+                @click="more"
+              >
                 更多
               </el-button>
             </div>
@@ -301,7 +423,9 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
-
+      .last-value {
+        width: 100% !important;
+      }
       .descriptions-item {
         width: 48%;
         margin: 4px 5px;
@@ -312,7 +436,9 @@
         .label-no {
           width: 28% !important;
         }
-
+        .last-label {
+          width: 16% !important;
+        }
         .label {
           width: 34%;
           box-sizing: border-box;
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
new file mode 100644
index 0000000..fa91c9e
--- /dev/null
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -0,0 +1,312 @@
+<script lang="ts" setup name="GasDialog">
+// import monitorDataGasList from './monitorDataGasList.vue'
+import dayjs from 'dayjs'
+// import { getMonitorData } from '@/api/home/pipeline/pipeline'
+import { getDataSearch } from '@/api/home/device/device'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false)
+// const wellId = ref('')
+// 初始化对话框
+// const gasRef = ref()
+const initDialog = (row: any) => {
+  console.log(row)
+  // wellId.value = id
+  if (row.deviceTypeName === '燃气智能监测终端') {
+    columns.value = columns1.value
+  } else if (row.deviceTypeName === '管网哨兵') {
+    columns.value = columns2.value
+  } else if (row.deviceTypeName === '智能警示桩') {
+    columns.value = columns3.value
+  } else if (row.deviceTypeName === '场站监测云台') {
+    columns.value = columns4.value
+  }
+  dialogFormVisible.value = true
+  listQuery.value.devcode = row.deviceCode
+  listQuery.value.typeName = row.deviceTypeName
+  datetimerange1.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  datetimerange2.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  setTimeout(() => {
+    fetchData()
+  })
+  // nextTick(() => {
+  //   gasRef.value.switchView()
+  // })
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref([])
+//  列表展示列
+const columns = ref<any>([])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+
+const listQuery = ref({
+  devcode: '',
+  logBegTime: '',
+  logEndTime: '',
+  typeName: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+// 开始结束时间
+const datetimerange1 = ref()
+watch(
+  () => datetimerange1.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const datetimerange2 = ref()
+watch(
+  () => datetimerange2.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const fetchData = () => {
+  loadingTable.value = true
+  // listQuery.value.devcode = $route.query.deviceCode as string
+  // listQuery.value.typeName = $route.query.typeName as string
+  getDataSearch(listQuery.value)
+    .then(res => {
+      // list.value = res.data.map((item: any) => {
+      //   for (const i in item) {
+      //     if (i.includes('ALARM')) {
+      //       if (i === 'PICTURE_ALARM') {
+      //         item[i] = item[i] === '0' ? '/' : item[i]
+      //       }
+      //       else {
+      //         item[i] = item[i] === '0' ? '正常' : '报警'
+      //       }
+      //     }
+      //   }
+      //   return item
+      // })
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+// onMounted(() => {
+//   datetimerange1.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   datetimerange2.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   setTimeout(() => {
+//     fetchData()
+//   })
+// })
+// 是否展示表格
+const isShowTable = ref(true)
+// 切换视图
+const switchView = () => {
+  isShowTable.value = !isShowTable.value
+  if (!isShowTable.value) {
+    resizePage()
+  }
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="燃气浓度"
+    append-to-body
+    width="1100px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="datetimerange1"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上传时间:</span
+          >
+          <el-date-picker
+            v-model="datetimerange2"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上传开始时间"
+            end-placeholder="上传结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      />
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="cancel"> 关闭 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.body {
+  width: 100%;
+
+  ::v-deep(.table-container) {
+    .button-area {
+      .custom {
+        width: 100%;
+      }
+    }
+  }
+}
+
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+// .body {
+//   ::v-deep(.button-left) {
+//     width: 100%;
+//   }
+// }
+::v-deep(.table-container) {
+  .button-left {
+    width: 100%;
+  }
+}
+</style>

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index a44fe4b..e68145d 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -211,7 +211,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index f480f1f..0b95a99 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -22,16 +22,16 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
-  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -166,6 +166,23 @@
     fetchData()
   })
 })
+// 跳转设备详情
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 const { proxy } = getCurrentInstance() as any
 </script>
 
@@ -246,6 +263,15 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
@@ -259,3 +285,18 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 106d488..b68eb45 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -106,7 +106,7 @@
   //   align: 'center',
   // },
   {
-    text: '设备使用状态',
+    text: '设备在用状态',
     value: 'onState',
     align: 'center',
   },
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index ffe9f93..b9b9421 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -6,14 +6,15 @@
 <script lang="ts" setup name="infoWindow">
 import { getPipelineDetail } from '@/api/home/pipeline/pipeline'
 import { getGasData } from '@/api/home/well/well'
-import gasDialog from '@/views/home/well/components/gasDialog.vue'
+// import gasDialog from '@/views/home/well/components/gasDialog.vue'
+import gasDialog from './gasDataDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 // 基本数据
 const baseInfo = ref({
   deviceTypeName: '', // 场站编号
-  deviceCode: '', // 场站名称
+  deviceCode: '' // 场站名称
 })
 const loading = ref(true)
 // 详细信息
@@ -23,73 +24,73 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '厂商',
     value: 'manufactureName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '压力级制',
     value: 'pressType',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '材质',
     value: 'material',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '建设年代',
     value: 'constructEra',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '安装位号',
     value: 'tagNumber',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '负责人',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '在用状态',
     value: 'onState',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
-    value: 'monitorState',
-    align: 'center',
+    value: 'monitorStateName',
+    align: 'center'
   },
   {
     text: '设备运行状态',
     value: 'status',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '设备编号',
   //   value: 'devcode',
@@ -110,7 +111,6 @@
   //   value: 'manageType',
   //   align: 'center',
   // },
-
 ])
 // 初始化
 const gasData = ref<any[]>([])
@@ -128,52 +128,85 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
-    if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+  gasData.value = []
+  if (
+    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName.includes('管网哨兵') ||
+    rowData.value.deviceTypeName.includes('智能警示桩')
+  ) {
+    // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
-      align: 'center',
+      align: 'center'
     })
-  }
-  else {
-    descriptionsList.value = descriptionsList.value.filter((item: any) => item.text !== '燃气浓度')
+  } else {
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
   }
   console.log(e.info.row, 'e.info.row')
   getPipelineDetail({
     id: e.info.row.id,
-    devcode: e.info.row.deviceCode,
-  }).then((res) => {
-    loading.value = false
-    detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
-      return
-    }
-    gasData.value = []
-    // 获取燃气浓度
-    getGasData({
-      wellId: rowData.value.id,
-      devCode: rowData.value.deviceCode,
-    }).then((res) => {
-      // console.log(res.data, '123321')
-      for (const i in res.data) {
-        if (i.includes('燃气')) {
-          // console.log(i, 'iiiiiiiii')
-          gasData.value.push({
-            name: i,
-            devcode: res.data[i].devcode,
-            state: res.data[i].state,
-            value: res.data[i].value,
-            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') ? '%LEL' : '',
-            stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
-          })
-        }
-      }
-    })
-  }).catch(() => {
-    loading.value = false
+    devcode: e.info.row.deviceCode
   })
+    .then(res => {
+      loading.value = false
+      detailInfo.value = res.data
+      if (
+        !(
+          rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+          rowData.value.deviceTypeName.includes('管网哨兵') ||
+          rowData.value.deviceTypeName.includes('智能警示桩')
+        )
+      ) {
+        return
+      }
+
+      // 获取燃气浓度
+      getGasData({
+        wellId: rowData.value.id,
+        devCode: rowData.value.deviceCode
+      }).then(res => {
+        // console.log(res.data, '123321')
+        for (const i in res.data) {
+          if (i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')) {
+            // console.log(i, 'iiiiiiiii')
+            gasData.value.push({
+              name: i,
+              devcode: res.data[i].devcode,
+              state: res.data[i].state,
+              value: res.data[i].value || '0.00',
+              text:
+                i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')
+                  ? '燃气浓度'
+                  : i.includes('液位')
+                  ? '液位状态'
+                  : i.includes('井盖')
+                  ? '井盖状态'
+                  : '',
+              unit: i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩') ? '%LEL' : '',
+              stateName:
+                res.data[i].state === '1'
+                  ? '正常'
+                  : res.data[i].state === '0'
+                  ? '离线'
+                  : res.data[i].state === '2'
+                  ? '报警'
+                  : ''
+            })
+          }
+        }
+        console.log(gasData.value, 'gasData.value')
+        gasData.value = gasData.value.filter(item => item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName))
+      })
+    })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -188,30 +221,39 @@
     query: {
       id: rowData.value.id,
       deviceCode: rowData.value.deviceCode,
-      typeName: rowData.value.deviceTypeName,
-    },
+      typeName: rowData.value.deviceTypeName
+    }
   })
 }
 // 燃气数据-更多
 const gasRef = ref()
 const more = () => {
-  gasRef.value.initDialog(rowData.value.id)
+  // detailInfo.value
+  gasRef.value.initDialog(rowData.value)
 }
 defineExpose({ initDialog, close })
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+  <div
+    v-show="dialogFormVisible"
+    class="container clearfix"
+    @mouseleave="() => {}"
+  >
     <gas-dialog ref="gasRef" />
     <div class="header">
-      <div style="display: flex;align-items: center;">
+      <div style="display: flex; align-items: center">
         <el-tooltip
-          class="box-item" effect="dark" :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
+          class="box-item"
+          effect="dark"
+          :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
           placement="top"
         >
-          <span class="title">{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }} </span>
+          <span class="title"
+            >{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }}
+          </span>
         </el-tooltip>
-        <el-button style="margin-left: 10px;" size="small" @click="goDetail">
+        <el-button style="margin-left: 10px" size="small" @click="goDetail">
           详情
         </el-button>
       </div>
@@ -219,22 +261,102 @@
     </div>
     <div class="body">
       <div class="descriptions">
-        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
-          <div class="label">
+        <div
+          v-for="item in descriptionsList"
+          :key="item.text"
+          class="descriptions-item"
+          :class="item.text === '燃气浓度' ? 'last-value' : ''"
+        >
+          <div
+            class="label"
+            :class="item.text === '燃气浓度' ? 'last-label' : ''"
+          >
             {{ item.text }}
           </div>
-          <div v-if="item.text !== '燃气浓度'" class="value" :title="detailInfo[item.value] || ''">
+          <div
+            v-if="
+              item.text !== '燃气浓度' &&
+              item.text !== '监控状态' &&
+              item.text !== '设备运行状态'
+            "
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
             {{ detailInfo[item.value] || '' }}
           </div>
+          <!-- 设备运行状态 -->
+          <div
+            v-if="item.text === '设备运行状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+          >
+            <span
+              style="margin-left: 10px"
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : ''
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
+          <!-- 监控状态 -->
+          <div
+            v-if="item.text === '监控状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
+            <span
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : detailInfo[item.value] === '未监控'
+                    ? '#a39f9f'
+                    : '#a39f9f'
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
 
-          <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
+          <!-- 燃气浓度 -->
+          <div
+            v-if="item.text === '燃气浓度' && gasData.length"
+            class="value"
+            style="width: 80%;margin-left: 10px;"
+          >
             <div v-for="item in gasData" v-show="item.text" :key="item.name">
-              {{ item.text }} :
-              <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
-                : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
-              }}</span>
-              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
+              {{ item.name }} :
+              <span :class="`${item.state === '1' ? '' : 'error'}`">
+                {{
+                  item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')
+                    ? item.value
+                    : item.stateName
+                }}</span
+              >
+              <span
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                :class="`${item.state === '1' ? '' : 'error'}`"
+              >
+                {{ item.unit }}</span
+              >
+              <el-button
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                size="small"
+                style="margin-left: 10px"
+                @click="more"
+              >
                 更多
               </el-button>
             </div>
@@ -301,7 +423,9 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
-
+      .last-value {
+        width: 100% !important;
+      }
       .descriptions-item {
         width: 48%;
         margin: 4px 5px;
@@ -312,7 +436,9 @@
         .label-no {
           width: 28% !important;
         }
-
+        .last-label {
+          width: 16% !important;
+        }
         .label {
           width: 34%;
           box-sizing: border-box;
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
new file mode 100644
index 0000000..fa91c9e
--- /dev/null
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -0,0 +1,312 @@
+<script lang="ts" setup name="GasDialog">
+// import monitorDataGasList from './monitorDataGasList.vue'
+import dayjs from 'dayjs'
+// import { getMonitorData } from '@/api/home/pipeline/pipeline'
+import { getDataSearch } from '@/api/home/device/device'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false)
+// const wellId = ref('')
+// 初始化对话框
+// const gasRef = ref()
+const initDialog = (row: any) => {
+  console.log(row)
+  // wellId.value = id
+  if (row.deviceTypeName === '燃气智能监测终端') {
+    columns.value = columns1.value
+  } else if (row.deviceTypeName === '管网哨兵') {
+    columns.value = columns2.value
+  } else if (row.deviceTypeName === '智能警示桩') {
+    columns.value = columns3.value
+  } else if (row.deviceTypeName === '场站监测云台') {
+    columns.value = columns4.value
+  }
+  dialogFormVisible.value = true
+  listQuery.value.devcode = row.deviceCode
+  listQuery.value.typeName = row.deviceTypeName
+  datetimerange1.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  datetimerange2.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  setTimeout(() => {
+    fetchData()
+  })
+  // nextTick(() => {
+  //   gasRef.value.switchView()
+  // })
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref([])
+//  列表展示列
+const columns = ref<any>([])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+
+const listQuery = ref({
+  devcode: '',
+  logBegTime: '',
+  logEndTime: '',
+  typeName: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+// 开始结束时间
+const datetimerange1 = ref()
+watch(
+  () => datetimerange1.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const datetimerange2 = ref()
+watch(
+  () => datetimerange2.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const fetchData = () => {
+  loadingTable.value = true
+  // listQuery.value.devcode = $route.query.deviceCode as string
+  // listQuery.value.typeName = $route.query.typeName as string
+  getDataSearch(listQuery.value)
+    .then(res => {
+      // list.value = res.data.map((item: any) => {
+      //   for (const i in item) {
+      //     if (i.includes('ALARM')) {
+      //       if (i === 'PICTURE_ALARM') {
+      //         item[i] = item[i] === '0' ? '/' : item[i]
+      //       }
+      //       else {
+      //         item[i] = item[i] === '0' ? '正常' : '报警'
+      //       }
+      //     }
+      //   }
+      //   return item
+      // })
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+// onMounted(() => {
+//   datetimerange1.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   datetimerange2.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   setTimeout(() => {
+//     fetchData()
+//   })
+// })
+// 是否展示表格
+const isShowTable = ref(true)
+// 切换视图
+const switchView = () => {
+  isShowTable.value = !isShowTable.value
+  if (!isShowTable.value) {
+    resizePage()
+  }
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="燃气浓度"
+    append-to-body
+    width="1100px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="datetimerange1"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上传时间:</span
+          >
+          <el-date-picker
+            v-model="datetimerange2"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上传开始时间"
+            end-placeholder="上传结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      />
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="cancel"> 关闭 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.body {
+  width: 100%;
+
+  ::v-deep(.table-container) {
+    .button-area {
+      .custom {
+        width: 100%;
+      }
+    }
+  }
+}
+
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+// .body {
+//   ::v-deep(.button-left) {
+//     width: 100%;
+//   }
+// }
+::v-deep(.table-container) {
+  .button-left {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index 6e04960..d1cda40 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -72,7 +72,7 @@
       url: `${publicPath}/image/pipeline/underground-normal.png`, // 图标地址
       anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      zIndex: 100, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
       url: `${publicPath}/image/pipeline/地埋式哨兵-异常.png`, // 图标地址
@@ -90,7 +90,7 @@
       url: `${publicPath}/image/pipeline/warning-normal.png`, // 图标地址
       anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      zIndex: 100, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
       url: `${publicPath}/image/pipeline/警示桩-异常.png`, // 图标地址

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index a44fe4b..e68145d 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -211,7 +211,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index f480f1f..0b95a99 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -22,16 +22,16 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
-  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -166,6 +166,23 @@
     fetchData()
   })
 })
+// 跳转设备详情
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 const { proxy } = getCurrentInstance() as any
 </script>
 
@@ -246,6 +263,15 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
@@ -259,3 +285,18 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 106d488..b68eb45 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -106,7 +106,7 @@
   //   align: 'center',
   // },
   {
-    text: '设备使用状态',
+    text: '设备在用状态',
     value: 'onState',
     align: 'center',
   },
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index ffe9f93..b9b9421 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -6,14 +6,15 @@
 <script lang="ts" setup name="infoWindow">
 import { getPipelineDetail } from '@/api/home/pipeline/pipeline'
 import { getGasData } from '@/api/home/well/well'
-import gasDialog from '@/views/home/well/components/gasDialog.vue'
+// import gasDialog from '@/views/home/well/components/gasDialog.vue'
+import gasDialog from './gasDataDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 // 基本数据
 const baseInfo = ref({
   deviceTypeName: '', // 场站编号
-  deviceCode: '', // 场站名称
+  deviceCode: '' // 场站名称
 })
 const loading = ref(true)
 // 详细信息
@@ -23,73 +24,73 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '厂商',
     value: 'manufactureName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '压力级制',
     value: 'pressType',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '材质',
     value: 'material',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '建设年代',
     value: 'constructEra',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '安装位号',
     value: 'tagNumber',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '负责人',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '在用状态',
     value: 'onState',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
-    value: 'monitorState',
-    align: 'center',
+    value: 'monitorStateName',
+    align: 'center'
   },
   {
     text: '设备运行状态',
     value: 'status',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '设备编号',
   //   value: 'devcode',
@@ -110,7 +111,6 @@
   //   value: 'manageType',
   //   align: 'center',
   // },
-
 ])
 // 初始化
 const gasData = ref<any[]>([])
@@ -128,52 +128,85 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
-    if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+  gasData.value = []
+  if (
+    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName.includes('管网哨兵') ||
+    rowData.value.deviceTypeName.includes('智能警示桩')
+  ) {
+    // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
-      align: 'center',
+      align: 'center'
     })
-  }
-  else {
-    descriptionsList.value = descriptionsList.value.filter((item: any) => item.text !== '燃气浓度')
+  } else {
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
   }
   console.log(e.info.row, 'e.info.row')
   getPipelineDetail({
     id: e.info.row.id,
-    devcode: e.info.row.deviceCode,
-  }).then((res) => {
-    loading.value = false
-    detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
-      return
-    }
-    gasData.value = []
-    // 获取燃气浓度
-    getGasData({
-      wellId: rowData.value.id,
-      devCode: rowData.value.deviceCode,
-    }).then((res) => {
-      // console.log(res.data, '123321')
-      for (const i in res.data) {
-        if (i.includes('燃气')) {
-          // console.log(i, 'iiiiiiiii')
-          gasData.value.push({
-            name: i,
-            devcode: res.data[i].devcode,
-            state: res.data[i].state,
-            value: res.data[i].value,
-            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') ? '%LEL' : '',
-            stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
-          })
-        }
-      }
-    })
-  }).catch(() => {
-    loading.value = false
+    devcode: e.info.row.deviceCode
   })
+    .then(res => {
+      loading.value = false
+      detailInfo.value = res.data
+      if (
+        !(
+          rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+          rowData.value.deviceTypeName.includes('管网哨兵') ||
+          rowData.value.deviceTypeName.includes('智能警示桩')
+        )
+      ) {
+        return
+      }
+
+      // 获取燃气浓度
+      getGasData({
+        wellId: rowData.value.id,
+        devCode: rowData.value.deviceCode
+      }).then(res => {
+        // console.log(res.data, '123321')
+        for (const i in res.data) {
+          if (i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')) {
+            // console.log(i, 'iiiiiiiii')
+            gasData.value.push({
+              name: i,
+              devcode: res.data[i].devcode,
+              state: res.data[i].state,
+              value: res.data[i].value || '0.00',
+              text:
+                i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')
+                  ? '燃气浓度'
+                  : i.includes('液位')
+                  ? '液位状态'
+                  : i.includes('井盖')
+                  ? '井盖状态'
+                  : '',
+              unit: i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩') ? '%LEL' : '',
+              stateName:
+                res.data[i].state === '1'
+                  ? '正常'
+                  : res.data[i].state === '0'
+                  ? '离线'
+                  : res.data[i].state === '2'
+                  ? '报警'
+                  : ''
+            })
+          }
+        }
+        console.log(gasData.value, 'gasData.value')
+        gasData.value = gasData.value.filter(item => item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName))
+      })
+    })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -188,30 +221,39 @@
     query: {
       id: rowData.value.id,
       deviceCode: rowData.value.deviceCode,
-      typeName: rowData.value.deviceTypeName,
-    },
+      typeName: rowData.value.deviceTypeName
+    }
   })
 }
 // 燃气数据-更多
 const gasRef = ref()
 const more = () => {
-  gasRef.value.initDialog(rowData.value.id)
+  // detailInfo.value
+  gasRef.value.initDialog(rowData.value)
 }
 defineExpose({ initDialog, close })
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+  <div
+    v-show="dialogFormVisible"
+    class="container clearfix"
+    @mouseleave="() => {}"
+  >
     <gas-dialog ref="gasRef" />
     <div class="header">
-      <div style="display: flex;align-items: center;">
+      <div style="display: flex; align-items: center">
         <el-tooltip
-          class="box-item" effect="dark" :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
+          class="box-item"
+          effect="dark"
+          :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
           placement="top"
         >
-          <span class="title">{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }} </span>
+          <span class="title"
+            >{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }}
+          </span>
         </el-tooltip>
-        <el-button style="margin-left: 10px;" size="small" @click="goDetail">
+        <el-button style="margin-left: 10px" size="small" @click="goDetail">
           详情
         </el-button>
       </div>
@@ -219,22 +261,102 @@
     </div>
     <div class="body">
       <div class="descriptions">
-        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
-          <div class="label">
+        <div
+          v-for="item in descriptionsList"
+          :key="item.text"
+          class="descriptions-item"
+          :class="item.text === '燃气浓度' ? 'last-value' : ''"
+        >
+          <div
+            class="label"
+            :class="item.text === '燃气浓度' ? 'last-label' : ''"
+          >
             {{ item.text }}
           </div>
-          <div v-if="item.text !== '燃气浓度'" class="value" :title="detailInfo[item.value] || ''">
+          <div
+            v-if="
+              item.text !== '燃气浓度' &&
+              item.text !== '监控状态' &&
+              item.text !== '设备运行状态'
+            "
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
             {{ detailInfo[item.value] || '' }}
           </div>
+          <!-- 设备运行状态 -->
+          <div
+            v-if="item.text === '设备运行状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+          >
+            <span
+              style="margin-left: 10px"
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : ''
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
+          <!-- 监控状态 -->
+          <div
+            v-if="item.text === '监控状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
+            <span
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : detailInfo[item.value] === '未监控'
+                    ? '#a39f9f'
+                    : '#a39f9f'
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
 
-          <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
+          <!-- 燃气浓度 -->
+          <div
+            v-if="item.text === '燃气浓度' && gasData.length"
+            class="value"
+            style="width: 80%;margin-left: 10px;"
+          >
             <div v-for="item in gasData" v-show="item.text" :key="item.name">
-              {{ item.text }} :
-              <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
-                : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
-              }}</span>
-              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
+              {{ item.name }} :
+              <span :class="`${item.state === '1' ? '' : 'error'}`">
+                {{
+                  item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')
+                    ? item.value
+                    : item.stateName
+                }}</span
+              >
+              <span
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                :class="`${item.state === '1' ? '' : 'error'}`"
+              >
+                {{ item.unit }}</span
+              >
+              <el-button
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                size="small"
+                style="margin-left: 10px"
+                @click="more"
+              >
                 更多
               </el-button>
             </div>
@@ -301,7 +423,9 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
-
+      .last-value {
+        width: 100% !important;
+      }
       .descriptions-item {
         width: 48%;
         margin: 4px 5px;
@@ -312,7 +436,9 @@
         .label-no {
           width: 28% !important;
         }
-
+        .last-label {
+          width: 16% !important;
+        }
         .label {
           width: 34%;
           box-sizing: border-box;
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
new file mode 100644
index 0000000..fa91c9e
--- /dev/null
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -0,0 +1,312 @@
+<script lang="ts" setup name="GasDialog">
+// import monitorDataGasList from './monitorDataGasList.vue'
+import dayjs from 'dayjs'
+// import { getMonitorData } from '@/api/home/pipeline/pipeline'
+import { getDataSearch } from '@/api/home/device/device'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false)
+// const wellId = ref('')
+// 初始化对话框
+// const gasRef = ref()
+const initDialog = (row: any) => {
+  console.log(row)
+  // wellId.value = id
+  if (row.deviceTypeName === '燃气智能监测终端') {
+    columns.value = columns1.value
+  } else if (row.deviceTypeName === '管网哨兵') {
+    columns.value = columns2.value
+  } else if (row.deviceTypeName === '智能警示桩') {
+    columns.value = columns3.value
+  } else if (row.deviceTypeName === '场站监测云台') {
+    columns.value = columns4.value
+  }
+  dialogFormVisible.value = true
+  listQuery.value.devcode = row.deviceCode
+  listQuery.value.typeName = row.deviceTypeName
+  datetimerange1.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  datetimerange2.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  setTimeout(() => {
+    fetchData()
+  })
+  // nextTick(() => {
+  //   gasRef.value.switchView()
+  // })
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref([])
+//  列表展示列
+const columns = ref<any>([])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+
+const listQuery = ref({
+  devcode: '',
+  logBegTime: '',
+  logEndTime: '',
+  typeName: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+// 开始结束时间
+const datetimerange1 = ref()
+watch(
+  () => datetimerange1.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const datetimerange2 = ref()
+watch(
+  () => datetimerange2.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const fetchData = () => {
+  loadingTable.value = true
+  // listQuery.value.devcode = $route.query.deviceCode as string
+  // listQuery.value.typeName = $route.query.typeName as string
+  getDataSearch(listQuery.value)
+    .then(res => {
+      // list.value = res.data.map((item: any) => {
+      //   for (const i in item) {
+      //     if (i.includes('ALARM')) {
+      //       if (i === 'PICTURE_ALARM') {
+      //         item[i] = item[i] === '0' ? '/' : item[i]
+      //       }
+      //       else {
+      //         item[i] = item[i] === '0' ? '正常' : '报警'
+      //       }
+      //     }
+      //   }
+      //   return item
+      // })
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+// onMounted(() => {
+//   datetimerange1.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   datetimerange2.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   setTimeout(() => {
+//     fetchData()
+//   })
+// })
+// 是否展示表格
+const isShowTable = ref(true)
+// 切换视图
+const switchView = () => {
+  isShowTable.value = !isShowTable.value
+  if (!isShowTable.value) {
+    resizePage()
+  }
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="燃气浓度"
+    append-to-body
+    width="1100px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="datetimerange1"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上传时间:</span
+          >
+          <el-date-picker
+            v-model="datetimerange2"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上传开始时间"
+            end-placeholder="上传结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      />
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="cancel"> 关闭 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.body {
+  width: 100%;
+
+  ::v-deep(.table-container) {
+    .button-area {
+      .custom {
+        width: 100%;
+      }
+    }
+  }
+}
+
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+// .body {
+//   ::v-deep(.button-left) {
+//     width: 100%;
+//   }
+// }
+::v-deep(.table-container) {
+  .button-left {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index 6e04960..d1cda40 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -72,7 +72,7 @@
       url: `${publicPath}/image/pipeline/underground-normal.png`, // 图标地址
       anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      zIndex: 100, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
       url: `${publicPath}/image/pipeline/地埋式哨兵-异常.png`, // 图标地址
@@ -90,7 +90,7 @@
       url: `${publicPath}/image/pipeline/warning-normal.png`, // 图标地址
       anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      zIndex: 100, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
       url: `${publicPath}/image/pipeline/警示桩-异常.png`, // 图标地址
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 1f7a2f9..4e6ad56 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -34,7 +34,7 @@
   { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
-  { text: '使用状态', value: 'onState', align: 'center', width: '90' },
+  { text: '在用状态', value: 'onState', align: 'center', width: '90' },
   { text: '监控状态', value: 'monitorState', align: 'center' },
 ])
 // 最终展示列
@@ -80,9 +80,9 @@
         lat: item.latGaode,
         lng: item.lngGaode,
         id: item.id,
-        status: item.onState === '投用' ? '1' : '0',
+        status: item.monitorState === '正常' ? '1' : '0',
       }))
-      console.log(mapList.value, 'mapList.value')
+      // console.log(mapList.value, 'mapList.value')
       setTimeout(() => {
         if (tableFlag.value === 'map') {
           mapRef.value.resetDraw()
@@ -126,6 +126,7 @@
       id: item.LEDGER_ID,
       status: item.ONLINE_STATE,
     }))
+    // console.log(mapList.value.filter(item => item.lng === '116.7069320679'), '561246664433')
     setTimeout(() => {
       if (tableFlag.value === 'map') {
         mapRef.value.resetDraw()
@@ -170,7 +171,7 @@
 const monitorStateList = ref<{ id: string; name: string; value: string }[]>([]) // 监控状态
 const fetchDict = () => {
   // 使用状态
-  getDictByCode('onState').then((res) => {
+  getDictByCode('onUseStatus').then((res) => {
     onStateList.value = res.data
   })
   // 监控状态
@@ -370,7 +371,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 160px !important;">
+        <el-select v-model="listQuery.onState" placeholder="在用状态" clearable class="select" style="width: 160px !important;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index a44fe4b..e68145d 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -211,7 +211,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index f480f1f..0b95a99 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -22,16 +22,16 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
-  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -166,6 +166,23 @@
     fetchData()
   })
 })
+// 跳转设备详情
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 const { proxy } = getCurrentInstance() as any
 </script>
 
@@ -246,6 +263,15 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
@@ -259,3 +285,18 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 106d488..b68eb45 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -106,7 +106,7 @@
   //   align: 'center',
   // },
   {
-    text: '设备使用状态',
+    text: '设备在用状态',
     value: 'onState',
     align: 'center',
   },
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index ffe9f93..b9b9421 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -6,14 +6,15 @@
 <script lang="ts" setup name="infoWindow">
 import { getPipelineDetail } from '@/api/home/pipeline/pipeline'
 import { getGasData } from '@/api/home/well/well'
-import gasDialog from '@/views/home/well/components/gasDialog.vue'
+// import gasDialog from '@/views/home/well/components/gasDialog.vue'
+import gasDialog from './gasDataDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 // 基本数据
 const baseInfo = ref({
   deviceTypeName: '', // 场站编号
-  deviceCode: '', // 场站名称
+  deviceCode: '' // 场站名称
 })
 const loading = ref(true)
 // 详细信息
@@ -23,73 +24,73 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '厂商',
     value: 'manufactureName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '压力级制',
     value: 'pressType',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '材质',
     value: 'material',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '建设年代',
     value: 'constructEra',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '安装位号',
     value: 'tagNumber',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '负责人',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '在用状态',
     value: 'onState',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
-    value: 'monitorState',
-    align: 'center',
+    value: 'monitorStateName',
+    align: 'center'
   },
   {
     text: '设备运行状态',
     value: 'status',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '设备编号',
   //   value: 'devcode',
@@ -110,7 +111,6 @@
   //   value: 'manageType',
   //   align: 'center',
   // },
-
 ])
 // 初始化
 const gasData = ref<any[]>([])
@@ -128,52 +128,85 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
-    if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+  gasData.value = []
+  if (
+    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName.includes('管网哨兵') ||
+    rowData.value.deviceTypeName.includes('智能警示桩')
+  ) {
+    // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
-      align: 'center',
+      align: 'center'
     })
-  }
-  else {
-    descriptionsList.value = descriptionsList.value.filter((item: any) => item.text !== '燃气浓度')
+  } else {
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
   }
   console.log(e.info.row, 'e.info.row')
   getPipelineDetail({
     id: e.info.row.id,
-    devcode: e.info.row.deviceCode,
-  }).then((res) => {
-    loading.value = false
-    detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
-      return
-    }
-    gasData.value = []
-    // 获取燃气浓度
-    getGasData({
-      wellId: rowData.value.id,
-      devCode: rowData.value.deviceCode,
-    }).then((res) => {
-      // console.log(res.data, '123321')
-      for (const i in res.data) {
-        if (i.includes('燃气')) {
-          // console.log(i, 'iiiiiiiii')
-          gasData.value.push({
-            name: i,
-            devcode: res.data[i].devcode,
-            state: res.data[i].state,
-            value: res.data[i].value,
-            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') ? '%LEL' : '',
-            stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
-          })
-        }
-      }
-    })
-  }).catch(() => {
-    loading.value = false
+    devcode: e.info.row.deviceCode
   })
+    .then(res => {
+      loading.value = false
+      detailInfo.value = res.data
+      if (
+        !(
+          rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+          rowData.value.deviceTypeName.includes('管网哨兵') ||
+          rowData.value.deviceTypeName.includes('智能警示桩')
+        )
+      ) {
+        return
+      }
+
+      // 获取燃气浓度
+      getGasData({
+        wellId: rowData.value.id,
+        devCode: rowData.value.deviceCode
+      }).then(res => {
+        // console.log(res.data, '123321')
+        for (const i in res.data) {
+          if (i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')) {
+            // console.log(i, 'iiiiiiiii')
+            gasData.value.push({
+              name: i,
+              devcode: res.data[i].devcode,
+              state: res.data[i].state,
+              value: res.data[i].value || '0.00',
+              text:
+                i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')
+                  ? '燃气浓度'
+                  : i.includes('液位')
+                  ? '液位状态'
+                  : i.includes('井盖')
+                  ? '井盖状态'
+                  : '',
+              unit: i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩') ? '%LEL' : '',
+              stateName:
+                res.data[i].state === '1'
+                  ? '正常'
+                  : res.data[i].state === '0'
+                  ? '离线'
+                  : res.data[i].state === '2'
+                  ? '报警'
+                  : ''
+            })
+          }
+        }
+        console.log(gasData.value, 'gasData.value')
+        gasData.value = gasData.value.filter(item => item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName))
+      })
+    })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -188,30 +221,39 @@
     query: {
       id: rowData.value.id,
       deviceCode: rowData.value.deviceCode,
-      typeName: rowData.value.deviceTypeName,
-    },
+      typeName: rowData.value.deviceTypeName
+    }
   })
 }
 // 燃气数据-更多
 const gasRef = ref()
 const more = () => {
-  gasRef.value.initDialog(rowData.value.id)
+  // detailInfo.value
+  gasRef.value.initDialog(rowData.value)
 }
 defineExpose({ initDialog, close })
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+  <div
+    v-show="dialogFormVisible"
+    class="container clearfix"
+    @mouseleave="() => {}"
+  >
     <gas-dialog ref="gasRef" />
     <div class="header">
-      <div style="display: flex;align-items: center;">
+      <div style="display: flex; align-items: center">
         <el-tooltip
-          class="box-item" effect="dark" :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
+          class="box-item"
+          effect="dark"
+          :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
           placement="top"
         >
-          <span class="title">{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }} </span>
+          <span class="title"
+            >{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }}
+          </span>
         </el-tooltip>
-        <el-button style="margin-left: 10px;" size="small" @click="goDetail">
+        <el-button style="margin-left: 10px" size="small" @click="goDetail">
           详情
         </el-button>
       </div>
@@ -219,22 +261,102 @@
     </div>
     <div class="body">
       <div class="descriptions">
-        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
-          <div class="label">
+        <div
+          v-for="item in descriptionsList"
+          :key="item.text"
+          class="descriptions-item"
+          :class="item.text === '燃气浓度' ? 'last-value' : ''"
+        >
+          <div
+            class="label"
+            :class="item.text === '燃气浓度' ? 'last-label' : ''"
+          >
             {{ item.text }}
           </div>
-          <div v-if="item.text !== '燃气浓度'" class="value" :title="detailInfo[item.value] || ''">
+          <div
+            v-if="
+              item.text !== '燃气浓度' &&
+              item.text !== '监控状态' &&
+              item.text !== '设备运行状态'
+            "
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
             {{ detailInfo[item.value] || '' }}
           </div>
+          <!-- 设备运行状态 -->
+          <div
+            v-if="item.text === '设备运行状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+          >
+            <span
+              style="margin-left: 10px"
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : ''
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
+          <!-- 监控状态 -->
+          <div
+            v-if="item.text === '监控状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
+            <span
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : detailInfo[item.value] === '未监控'
+                    ? '#a39f9f'
+                    : '#a39f9f'
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
 
-          <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
+          <!-- 燃气浓度 -->
+          <div
+            v-if="item.text === '燃气浓度' && gasData.length"
+            class="value"
+            style="width: 80%;margin-left: 10px;"
+          >
             <div v-for="item in gasData" v-show="item.text" :key="item.name">
-              {{ item.text }} :
-              <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
-                : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
-              }}</span>
-              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
+              {{ item.name }} :
+              <span :class="`${item.state === '1' ? '' : 'error'}`">
+                {{
+                  item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')
+                    ? item.value
+                    : item.stateName
+                }}</span
+              >
+              <span
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                :class="`${item.state === '1' ? '' : 'error'}`"
+              >
+                {{ item.unit }}</span
+              >
+              <el-button
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                size="small"
+                style="margin-left: 10px"
+                @click="more"
+              >
                 更多
               </el-button>
             </div>
@@ -301,7 +423,9 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
-
+      .last-value {
+        width: 100% !important;
+      }
       .descriptions-item {
         width: 48%;
         margin: 4px 5px;
@@ -312,7 +436,9 @@
         .label-no {
           width: 28% !important;
         }
-
+        .last-label {
+          width: 16% !important;
+        }
         .label {
           width: 34%;
           box-sizing: border-box;
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
new file mode 100644
index 0000000..fa91c9e
--- /dev/null
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -0,0 +1,312 @@
+<script lang="ts" setup name="GasDialog">
+// import monitorDataGasList from './monitorDataGasList.vue'
+import dayjs from 'dayjs'
+// import { getMonitorData } from '@/api/home/pipeline/pipeline'
+import { getDataSearch } from '@/api/home/device/device'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false)
+// const wellId = ref('')
+// 初始化对话框
+// const gasRef = ref()
+const initDialog = (row: any) => {
+  console.log(row)
+  // wellId.value = id
+  if (row.deviceTypeName === '燃气智能监测终端') {
+    columns.value = columns1.value
+  } else if (row.deviceTypeName === '管网哨兵') {
+    columns.value = columns2.value
+  } else if (row.deviceTypeName === '智能警示桩') {
+    columns.value = columns3.value
+  } else if (row.deviceTypeName === '场站监测云台') {
+    columns.value = columns4.value
+  }
+  dialogFormVisible.value = true
+  listQuery.value.devcode = row.deviceCode
+  listQuery.value.typeName = row.deviceTypeName
+  datetimerange1.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  datetimerange2.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  setTimeout(() => {
+    fetchData()
+  })
+  // nextTick(() => {
+  //   gasRef.value.switchView()
+  // })
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref([])
+//  列表展示列
+const columns = ref<any>([])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+
+const listQuery = ref({
+  devcode: '',
+  logBegTime: '',
+  logEndTime: '',
+  typeName: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+// 开始结束时间
+const datetimerange1 = ref()
+watch(
+  () => datetimerange1.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const datetimerange2 = ref()
+watch(
+  () => datetimerange2.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const fetchData = () => {
+  loadingTable.value = true
+  // listQuery.value.devcode = $route.query.deviceCode as string
+  // listQuery.value.typeName = $route.query.typeName as string
+  getDataSearch(listQuery.value)
+    .then(res => {
+      // list.value = res.data.map((item: any) => {
+      //   for (const i in item) {
+      //     if (i.includes('ALARM')) {
+      //       if (i === 'PICTURE_ALARM') {
+      //         item[i] = item[i] === '0' ? '/' : item[i]
+      //       }
+      //       else {
+      //         item[i] = item[i] === '0' ? '正常' : '报警'
+      //       }
+      //     }
+      //   }
+      //   return item
+      // })
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+// onMounted(() => {
+//   datetimerange1.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   datetimerange2.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   setTimeout(() => {
+//     fetchData()
+//   })
+// })
+// 是否展示表格
+const isShowTable = ref(true)
+// 切换视图
+const switchView = () => {
+  isShowTable.value = !isShowTable.value
+  if (!isShowTable.value) {
+    resizePage()
+  }
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="燃气浓度"
+    append-to-body
+    width="1100px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="datetimerange1"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上传时间:</span
+          >
+          <el-date-picker
+            v-model="datetimerange2"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上传开始时间"
+            end-placeholder="上传结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      />
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="cancel"> 关闭 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.body {
+  width: 100%;
+
+  ::v-deep(.table-container) {
+    .button-area {
+      .custom {
+        width: 100%;
+      }
+    }
+  }
+}
+
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+// .body {
+//   ::v-deep(.button-left) {
+//     width: 100%;
+//   }
+// }
+::v-deep(.table-container) {
+  .button-left {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index 6e04960..d1cda40 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -72,7 +72,7 @@
       url: `${publicPath}/image/pipeline/underground-normal.png`, // 图标地址
       anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      zIndex: 100, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
       url: `${publicPath}/image/pipeline/地埋式哨兵-异常.png`, // 图标地址
@@ -90,7 +90,7 @@
       url: `${publicPath}/image/pipeline/warning-normal.png`, // 图标地址
       anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      zIndex: 100, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
       url: `${publicPath}/image/pipeline/警示桩-异常.png`, // 图标地址
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 1f7a2f9..4e6ad56 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -34,7 +34,7 @@
   { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
-  { text: '使用状态', value: 'onState', align: 'center', width: '90' },
+  { text: '在用状态', value: 'onState', align: 'center', width: '90' },
   { text: '监控状态', value: 'monitorState', align: 'center' },
 ])
 // 最终展示列
@@ -80,9 +80,9 @@
         lat: item.latGaode,
         lng: item.lngGaode,
         id: item.id,
-        status: item.onState === '投用' ? '1' : '0',
+        status: item.monitorState === '正常' ? '1' : '0',
       }))
-      console.log(mapList.value, 'mapList.value')
+      // console.log(mapList.value, 'mapList.value')
       setTimeout(() => {
         if (tableFlag.value === 'map') {
           mapRef.value.resetDraw()
@@ -126,6 +126,7 @@
       id: item.LEDGER_ID,
       status: item.ONLINE_STATE,
     }))
+    // console.log(mapList.value.filter(item => item.lng === '116.7069320679'), '561246664433')
     setTimeout(() => {
       if (tableFlag.value === 'map') {
         mapRef.value.resetDraw()
@@ -170,7 +171,7 @@
 const monitorStateList = ref<{ id: string; name: string; value: string }[]>([]) // 监控状态
 const fetchDict = () => {
   // 使用状态
-  getDictByCode('onState').then((res) => {
+  getDictByCode('onUseStatus').then((res) => {
     onStateList.value = res.data
   })
   // 监控状态
@@ -370,7 +371,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 160px !important;">
+        <el-select v-model="listQuery.onState" placeholder="在用状态" clearable class="select" style="width: 160px !important;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index e62199c..0eaaf34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警名称', value: 'alarmName', align: 'center', isRequire: false },
+  { text: '报警名称', value: 'alarmName', align: 'center', isRequired: false },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
   { text: '设备类型', value: 'typeName', align: 'center' },
   { text: '产品', value: 'productName', align: 'center' },

diff --git a/src/components/TableContainer/configColumnsDialog.vue b/src/components/TableContainer/configColumnsDialog.vue
index 2b9a6fc..ba52593 100644
--- a/src/components/TableContainer/configColumnsDialog.vue
+++ b/src/components/TableContainer/configColumnsDialog.vue
@@ -19,7 +19,7 @@
   }
   else {
     // checkList.value = data.columns.filter((item: any) => item.isRequired).map((item: any) => item.text)
-    checkList.value = data.columns.map((item: any) => item.text)
+    checkList.value = data.columns.filter((item: any) => item.isRequired !== false).map((item: any) => item.text)
   }
   dialogFormVisible.value = true
 }
diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index 6e6af6a..d5e5701 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -65,7 +65,7 @@
 else {
   console.log('无存储', props.configTitle, props.columns)
   // props.edit(props.columns.filter((item: any) => item.isRequired))
-  props.edit(props.columns)
+  props.edit(props.columns.filter((item: any) => item.isRequired !== false))
 }
 </script>
 
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 7e294c3..960271d 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -104,7 +104,10 @@
       isSound: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.isSound || '',
     }))
     loading.value = false
-    play()
+    // play()
+    if (messageList.value.length > 0 && messageList.value.some((item: any) => item.isSound === '1')) {
+      proxy.playAudio()
+    }
   }).catch(() => {
     loading.value = false
   })
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index a306b44..94a98a1 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -224,7 +224,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index d48355f..b919f1a 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -7,6 +7,7 @@
 import pendingDialog from './pendingDialog.vue'
 import remindDialog from './remindDialog.vue'
 import monitorDataDialog from './monitorDataDialog.vue'
+import gasDataDialog from './gasDataDialog.vue'
 import processDialog from './processDialog.vue'
 import handlerDialog from './handlerDialog.vue'
 import { detailAlarm, getPrincipals } from '@/api/home/alarm/current'
@@ -58,7 +59,12 @@
 
 // 查看数据
 const dataRef = ref()
+const gasRef = ref()
 const viewData = () => {
+  if(info.value.devTypeName === '管网哨兵') {
+    gasRef.value.initDialog(info.value)
+    return
+  }
   dataRef.value.initDialog(info.value)
 }
 // 更多
@@ -125,6 +131,7 @@
     <remind-dialog ref="remindRef" @refresh="refresh" />
     <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
+    <gas-data-dialog ref="gasRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
     <!-- 是否误报 -->
@@ -166,7 +173,7 @@
         报警设备:
         <span style="padding-left: 6px;">{{ info.devcode }} </span>
         <el-button
-          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
+          v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')"
           size="small" style="margin-left: 6px;" @click="viewData"
         >
           查看数据
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
new file mode 100644
index 0000000..ed2b98d
--- /dev/null
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -0,0 +1,415 @@
+<!--
+  Description: 报警管理-查看数据(监控数据) -- 管网哨兵
+  Author: 李亚光
+  Date: 2024-09-10
+ -->
+<script lang="ts" setup name="MonitorDataDialog">
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { exportDeviceData, getDataSearch } from '@/api/home/device/device'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { exportFile } from '@/utils/exportUtils'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false) // 对话框是否显示
+const info = ref()
+const listQuery = ref({
+  devcode: '',
+  typeName: '',
+  logBegTime: '',
+  logEndTime: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+const deviceTypeList = ref<any[]>([])
+// 时间查询条件
+const timerangForCollect = ref<string[]>([])
+const timerangForReport = ref<string[]>([])
+watch(
+  () => timerangForCollect.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+watch(
+  () => timerangForReport.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  }
+)
+
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
+//  列表展示列
+const columns = ref<any>([
+  // { text: '设备编号', value: 'devcode', align: 'center' },
+  // { text: '燃气浓度（%LEL)', value: 'snr', align: 'center' },
+  // { text: '电量(%)', value: 'cell', align: 'center' },
+  // { text: '信号强度', value: 'strength', align: 'center' },
+  // { text: '采集时间', value: 'uptime', align: 'center' },
+  // { text: '上传时间', value: 'logtime', align: 'center' },
+])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// DATA_GAS("燃气智能监测终端", "data_gas", "devcode,uptime,logtime", "id,well_code,devcode设备编号,cell电量,strength浓度,descn,uptime采集时间,logtime上传时间,pci,rsrp,snr", "logtime"),
+// DATA_TUBE_OTHER("管网哨兵", "data_tube_other", "devcode,uptime,logtime", "DEVCODE设备编号,GASVAL浓度, VBAT电压,SIN,RSRP,SINR,UPTIME采集时间,LOGTIME上传时间", "logtime"),
+// DATA_MONITOR_PIPE_OTHER("智能警示桩", "data_monitor_pipe_other", "devcode,uptime,logtime", "TEMPERATURE,HUMIDITY,VBAT,PIPE_INCLINE_ALARM,PIPE_BREAK_ALARM,LEFT_OFF_LINE_ALARM,LEFT_VIBRATE_ALARM,RIGHT_OFF_LINE_ALARM,RIGHT_VIBRATE_ALARM,PICTURE_ALARM,LEFT_GAS,RIGHT_GAS,LOGTIME,UPTIME ", "logtime"),
+// DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+const fetchData = () => {
+  listQuery.value.devcode = info.value.devcode
+  listQuery.value.typeName = info.value.devTypeName
+  loadingTable.value = true
+  getDataSearch(listQuery.value)
+    .then(res => {
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      xAxisData.value = list.value
+        .slice()
+        .reverse()
+        .map(item => item.logtime)
+      if (
+        !listQuery.value.typeName ||
+        listQuery.value.typeName === '燃气智能监测终端'
+      ) {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.snr || '0')
+          },
+          {
+            name: '电量',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.cell || '0')
+          },
+          {
+            name: '信号强度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.strength || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '管网哨兵') {
+        data.value = [
+          {
+            name: '燃气浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.gasval || '0')
+          },
+          {
+            name: '电压',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.vbat || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '智能警示桩') {
+        data.value = [
+          {
+            name: '左侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.leftGas || '0')
+          },
+          {
+            name: '右侧甲烷值',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.rightGas || '0')
+          }
+        ]
+      } else if (listQuery.value.typeName === '场站监测云台') {
+        data.value = [
+          {
+            name: '浓度',
+            data: list.value
+              .slice()
+              .reverse()
+              .map(item => item.concentration || '0')
+          }
+        ]
+      }
+
+      console.log(xAxisData.value, data.value)
+      loadingTable.value = false
+      if (!showTable.value) {
+        // fetchData()
+        resizePage()
+      }
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
+// 初始化对话框
+const initDialog = (row: any) => {
+  timerangForCollect.value = [
+  dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+  dayjs().format('YYYY-MM-DD HH:mm:ss')
+]
+// timerangForReport.value = [
+//   dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+//   dayjs().format('YYYY-MM-DD HH:mm:ss')
+// ]
+  console.log(row, 'row')
+  dialogFormVisible.value = true
+  info.value = row
+  if (row.devTypeName) {
+    if (row.devTypeName === '燃气智能监测终端') {
+      columns.value = columns1.value
+    } else if (row.devTypeName === '管网哨兵') {
+      columns.value = columns2.value
+    } else if (row.devTypeName === '智能警示桩') {
+      columns.value = columns3.value
+    } else if (row.devTypeName === '场站监测云台') {
+      columns.value = columns4.value
+    } else {
+      columns.value = columns1.value
+    }
+  } else {
+    columns.value = columns1.value
+  }
+  setTimeout(() => {
+    fetchData()
+    if(showTable.value) {
+      changeView()
+    }
+  });
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="查看数据"
+    append-to-body
+    width="900px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="timerangForCollect"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <!-- <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上报时间:</span
+          >
+          <el-date-picker
+            v-model="timerangForReport"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上报开始时间"
+            end-placeholder="上报结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          /> -->
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="changeView"
+          >
+            切换视图
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-if="showTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="listQuery"
+        :height="350"
+        :list-loading="loadingTable"
+        :pagination="false"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <div v-show="!showTable" style="height: 250px">
+        <line-chart
+          v-show="xAxisData.length"
+          v-loading="loadingTable"
+          :x-axis-data="xAxisData"
+          :data="data"
+          :gradient="false"
+          :legend="{
+            itemWidth: 8,
+            itemHeight: 8,
+            type: 'scroll',
+            orient: 'horizontal',
+            icon: 'roundRect',
+            right: '0',
+            top: '10'
+          }"
+          :grid="{
+            top: 50,
+            left: 30,
+            right: 30,
+            bottom: 20,
+            containLabel: true // 是否包含坐标轴的刻度标签
+          }"
+        />
+        <el-empty
+          v-show="!xAxisData.length"
+          description="暂无数据"
+          :image-size="100"
+        />
+      </div>
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="cancel"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+.red {
+  color: red;
+}
+</style>
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f763f90..604efae 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -188,6 +188,7 @@
         :total="0"
         :columns="columns"
         :query="{}"
+        :height="350"
         :list-loading="loadingTable"
         :pagination="false"
       >
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index 85d9bcb..fcb5c42 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -96,10 +96,14 @@
         <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].APPROVAL_PERSON}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
+        <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
+        <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         `
+        console.log( processData.value[1], ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, '123')
         // console.log(data, '2222222')
         data.forEach((item: any, index: number) => {
           // console.log(item, 'item')
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 3a2d08d..8610a25 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -29,15 +29,15 @@
 const $router = useRouter()
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类型', value: 'alarmType', align: 'center', width: '160' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '100' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
+  { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
   { text: '报警原因', value: 'alarmMsg', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备类型', value: 'devTypeName', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true },
-  { text: '管理单位', value: 'deptName', align: 'center' },
+  { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
+  { text: '管理单位', value: 'deptName', align: 'center', width: '400' },
   { text: '状态', value: 'processStatusName', align: 'center', width: '120' },
-  { text: '报警时间', value: 'ts', align: 'center' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
diff --git a/src/views/home/dashboard/components/noticeDialog.vue b/src/views/home/dashboard/components/noticeDialog.vue
index 1dd57cc..f27bb53 100644
--- a/src/views/home/dashboard/components/noticeDialog.vue
+++ b/src/views/home/dashboard/components/noticeDialog.vue
@@ -37,7 +37,7 @@
 // 查看详情
 const detail = (row: any) => {
   // 报警类跳转
-  if (row.messageTypeDetail.includes('报警')) {
+  // if (row.messageTypeDetail.includes('报警')) {
     if (row.alarmId) {
       $router.push({
         name: 'AlarmCurrentDetail',
@@ -50,8 +50,22 @@
     else {
       ElMessage.warning('该数据缺少报警信息')
     }
-  }
+  // }
 }
+const disabledBtn = computed(() => {
+  return (name:string) => {
+     if(name.includes('解除')) {
+        return true
+     }
+     if(name.includes('施工')) {
+        return true
+     }
+    //  if(name.includes('超限')) {
+    //     return false
+    //  }
+     return false
+  }
+})
 </script>
 
 <template>
@@ -65,7 +79,7 @@
           <template #default="scope">
             <el-button
               type="primary" link size="small"
-              :disabled="!((scope.row.messageTypeDetail.includes('报警') && !scope.row.messageTypeDetail.includes('解除')) || scope.row.messageTypeDetail.includes('施工'))"
+              :disabled="disabledBtn(scope.row.messageTypeDetail)"
               @click="detail(scope.row)"
             >
               查看
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fa9ad75..bad2c42 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,8 +18,8 @@
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
-  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true },
-  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true },
+  { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
+  { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -34,7 +34,7 @@
   offset: 1,
   gridCode: '', // 编号
   locationState: '', // 位置状态
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
 })
 // 查询数据
 const fetchData = () => {
@@ -55,7 +55,7 @@
     offset: 1,
     gridCode: '', // 编号
     locationState: '', // 位置状态
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
   }
   fetchData()
 }
@@ -103,11 +103,11 @@
 }
 // const isUsed = ref<{ id: string; name: string; value: string }[]>([]) // 是否启用
 // // 获取字典
-// const fetchDict = async () => {
-//   // 是否启用
-//   const res = await getDictByCode('isUsed')
-//   isUsed.value = res.data
-// }
+const fetchDict = async () => {
+  // 是否启用
+  // const res = await getDictByCode('isUsed')
+  // isUsed.value = res.data
+}
 onMounted(async () => {
   // await fetchDict()
   fetchData()
@@ -123,7 +123,7 @@
         <el-input v-model="listQuery.gridCode" placeholder="网格编号" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.locationState" placeholder="坐标状态" filterable clearable style="width: 192px;">
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index 0eb8f7f..d18ee54 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -42,7 +42,7 @@
   offset: 1,
   tagNumber: '', // 位号
   ledgerName: '', // 名称
-  responsibleDept: '', // 管理单位
+  deptid: '', // 管理单位
   locationState: '',
   type: props.type,
 })
@@ -65,7 +65,7 @@
     offset: 1,
     tagNumber: '', // 位号
     ledgerName: '', // 名称
-    responsibleDept: '', // 管理单位
+    deptid: '', // 管理单位
     locationState: '',
     type: props.type,
   }
@@ -138,7 +138,7 @@
         <el-input v-model="listQuery.ledgerName" placeholder="名称" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.responsibleDept" placeholder="管理单位" :clearable="true" style="width: 192px;" />
+        <dept-select v-model="listQuery.deptid" placeholder="管理单位" :clearable="true" style="width: 192px;" />
       </search-item>
       <!-- <search-item>
         <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 53961f2..56615d9 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -219,7 +219,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index 17d03cf..8d65425 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
@@ -254,6 +254,25 @@
   })
 }
 fetchDict()
+
+// 跳转设备详情
+const $router = useRouter()
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 </script>
 
 <template>
@@ -340,6 +359,15 @@
                 </template>
               </el-table-column>
             </template>
+            <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
             <template #columns>
               <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="80">
                 <template #default="scope">
@@ -375,6 +403,18 @@
 </template>
 
 <style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
 .table {
   width: 100% !important;
 }
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index a44fe4b..e68145d 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -211,7 +211,7 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer' : item.text === '位置' ? 'pointer link' : ''}`"
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
             @click="showMap(item)"
           >
             {{ detailInfo[item.value] || '' }}
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index f480f1f..0b95a99 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -22,16 +22,16 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '设备编号', value: 'devCode', align: 'center' },
+  { text: '设备编号', value: 'devCode', align: 'center', isCustom: true, },
   { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '位置', value: 'position', align: 'center' },
   { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center', width: '110' },
-  { text: '解除时间', value: 'cancelTime', align: 'center', width: '190' },
-  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '190' },
+  { text: '报警时间', value: 'alarmTime', align: 'center', width: '170' },
+  { text: '解除时间', value: 'cancelTime', align: 'center', width: '170' },
+  { text: '解除时长', value: 'cancelDuration', align: 'center', width: '160' },
 ])
 // 最终展示列
 const columnsConfig = ref([])
@@ -166,6 +166,23 @@
     fetchData()
   })
 })
+// 跳转设备详情
+const toDeviceDetail = (row: any) => {
+  $router.push({
+    name: 'DeviceManageDetail',
+    params: {
+      type: 'detail',
+    },
+    query: {
+      row: JSON.stringify({
+        devcode: row.devCode || row.devcode,
+        deviceType: row.devTypeName,
+        deviceTypeName: row.devTypeName,
+        devTypeName: row.devTypeName,
+      }),
+    },
+  })
+}
 const { proxy } = getCurrentInstance() as any
 </script>
 
@@ -246,6 +263,15 @@
             </template>
           </el-table-column>
         </template>
+        <template #isCustom="{ scope, column }">
+              <!-- 设备编号 -->
+              <span
+                v-if="column.text === '设备编号'" class="pointer link"
+                @click="toDeviceDetail(scope.row)"
+              >
+                {{ scope.row[column.value] }}
+              </span>
+            </template>
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="80">
             <template #default="scope">
@@ -259,3 +285,18 @@
     </table-container>
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+.pointer {
+  &:hover {
+    cursor: pointer;
+  }
+}
+.link {
+  color: #0d76d4 !important;
+
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 106d488..b68eb45 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -106,7 +106,7 @@
   //   align: 'center',
   // },
   {
-    text: '设备使用状态',
+    text: '设备在用状态',
     value: 'onState',
     align: 'center',
   },
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index ffe9f93..b9b9421 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -6,14 +6,15 @@
 <script lang="ts" setup name="infoWindow">
 import { getPipelineDetail } from '@/api/home/pipeline/pipeline'
 import { getGasData } from '@/api/home/well/well'
-import gasDialog from '@/views/home/well/components/gasDialog.vue'
+// import gasDialog from '@/views/home/well/components/gasDialog.vue'
+import gasDialog from './gasDataDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
 // 基本数据
 const baseInfo = ref({
   deviceTypeName: '', // 场站编号
-  deviceCode: '', // 场站名称
+  deviceCode: '' // 场站名称
 })
 const loading = ref(true)
 // 详细信息
@@ -23,73 +24,73 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '厂商',
     value: 'manufactureName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '压力级制',
     value: 'pressType',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '材质',
     value: 'material',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '建设年代',
     value: 'constructEra',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '安装位号',
     value: 'tagNumber',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '负责人',
     value: '',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '在用状态',
     value: 'onState',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
-    value: 'monitorState',
-    align: 'center',
+    value: 'monitorStateName',
+    align: 'center'
   },
   {
     text: '设备运行状态',
     value: 'status',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '设备编号',
   //   value: 'devcode',
@@ -110,7 +111,6 @@
   //   value: 'manageType',
   //   align: 'center',
   // },
-
 ])
 // 初始化
 const gasData = ref<any[]>([])
@@ -128,52 +128,85 @@
   detailInfo.value = e.info.row
   rowData.value = e.info.row
   loading.value = true
-  if (rowData.value.deviceTypeName.includes('燃气智能监测终端')) {
-    if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+  gasData.value = []
+  if (
+    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName.includes('管网哨兵') ||
+    rowData.value.deviceTypeName.includes('智能警示桩')
+  ) {
+    // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
-      align: 'center',
+      align: 'center'
     })
-  }
-  else {
-    descriptionsList.value = descriptionsList.value.filter((item: any) => item.text !== '燃气浓度')
+  } else {
+    descriptionsList.value = descriptionsList.value.filter(
+      (item: any) => item.text !== '燃气浓度'
+    )
   }
   console.log(e.info.row, 'e.info.row')
   getPipelineDetail({
     id: e.info.row.id,
-    devcode: e.info.row.deviceCode,
-  }).then((res) => {
-    loading.value = false
-    detailInfo.value = res.data
-    if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端'))) {
-      return
-    }
-    gasData.value = []
-    // 获取燃气浓度
-    getGasData({
-      wellId: rowData.value.id,
-      devCode: rowData.value.deviceCode,
-    }).then((res) => {
-      // console.log(res.data, '123321')
-      for (const i in res.data) {
-        if (i.includes('燃气')) {
-          // console.log(i, 'iiiiiiiii')
-          gasData.value.push({
-            name: i,
-            devcode: res.data[i].devcode,
-            state: res.data[i].state,
-            value: res.data[i].value,
-            text: i.includes('燃气') ? '燃气浓度' : i.includes('液位') ? '液位状态' : i.includes('井盖') ? '井盖状态' : '',
-            unit: i.includes('燃气') ? '%LEL' : '',
-            stateName: res.data[i].state === '1' ? '正常' : res.data[i].state === '0' ? '离线' : res.data[i].state === '2' ? '报警' : '',
-          })
-        }
-      }
-    })
-  }).catch(() => {
-    loading.value = false
+    devcode: e.info.row.deviceCode
   })
+    .then(res => {
+      loading.value = false
+      detailInfo.value = res.data
+      if (
+        !(
+          rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
+          rowData.value.deviceTypeName.includes('管网哨兵') ||
+          rowData.value.deviceTypeName.includes('智能警示桩')
+        )
+      ) {
+        return
+      }
+
+      // 获取燃气浓度
+      getGasData({
+        wellId: rowData.value.id,
+        devCode: rowData.value.deviceCode
+      }).then(res => {
+        // console.log(res.data, '123321')
+        for (const i in res.data) {
+          if (i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')) {
+            // console.log(i, 'iiiiiiiii')
+            gasData.value.push({
+              name: i,
+              devcode: res.data[i].devcode,
+              state: res.data[i].state,
+              value: res.data[i].value || '0.00',
+              text:
+                i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩')
+                  ? '燃气浓度'
+                  : i.includes('液位')
+                  ? '液位状态'
+                  : i.includes('井盖')
+                  ? '井盖状态'
+                  : '',
+              unit: i.includes('燃气') || i.includes('管网哨兵') || i.includes('智能警示桩') ? '%LEL' : '',
+              stateName:
+                res.data[i].state === '1'
+                  ? '正常'
+                  : res.data[i].state === '0'
+                  ? '离线'
+                  : res.data[i].state === '2'
+                  ? '报警'
+                  : ''
+            })
+          }
+        }
+        console.log(gasData.value, 'gasData.value')
+        gasData.value = gasData.value.filter(item => item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName))
+      })
+    })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -188,30 +221,39 @@
     query: {
       id: rowData.value.id,
       deviceCode: rowData.value.deviceCode,
-      typeName: rowData.value.deviceTypeName,
-    },
+      typeName: rowData.value.deviceTypeName
+    }
   })
 }
 // 燃气数据-更多
 const gasRef = ref()
 const more = () => {
-  gasRef.value.initDialog(rowData.value.id)
+  // detailInfo.value
+  gasRef.value.initDialog(rowData.value)
 }
 defineExpose({ initDialog, close })
 </script>
 
 <template>
-  <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+  <div
+    v-show="dialogFormVisible"
+    class="container clearfix"
+    @mouseleave="() => {}"
+  >
     <gas-dialog ref="gasRef" />
     <div class="header">
-      <div style="display: flex;align-items: center;">
+      <div style="display: flex; align-items: center">
         <el-tooltip
-          class="box-item" effect="dark" :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
+          class="box-item"
+          effect="dark"
+          :content="`${baseInfo.deviceCode} | ${baseInfo.deviceTypeName}`"
           placement="top"
         >
-          <span class="title">{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }} </span>
+          <span class="title"
+            >{{ baseInfo.deviceCode }} | {{ baseInfo.deviceTypeName }}
+          </span>
         </el-tooltip>
-        <el-button style="margin-left: 10px;" size="small" @click="goDetail">
+        <el-button style="margin-left: 10px" size="small" @click="goDetail">
           详情
         </el-button>
       </div>
@@ -219,22 +261,102 @@
     </div>
     <div class="body">
       <div class="descriptions">
-        <div v-for="item in descriptionsList" :key="item.text" class="descriptions-item">
-          <div class="label">
+        <div
+          v-for="item in descriptionsList"
+          :key="item.text"
+          class="descriptions-item"
+          :class="item.text === '燃气浓度' ? 'last-value' : ''"
+        >
+          <div
+            class="label"
+            :class="item.text === '燃气浓度' ? 'last-label' : ''"
+          >
             {{ item.text }}
           </div>
-          <div v-if="item.text !== '燃气浓度'" class="value" :title="detailInfo[item.value] || ''">
+          <div
+            v-if="
+              item.text !== '燃气浓度' &&
+              item.text !== '监控状态' &&
+              item.text !== '设备运行状态'
+            "
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
             {{ detailInfo[item.value] || '' }}
           </div>
+          <!-- 设备运行状态 -->
+          <div
+            v-if="item.text === '设备运行状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+          >
+            <span
+              style="margin-left: 10px"
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : ''
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
+          <!-- 监控状态 -->
+          <div
+            v-if="item.text === '监控状态'"
+            class="value"
+            :title="detailInfo[item.value] || ''"
+             style="margin-left: 10px"
+          >
+            <span
+              :style="{
+                color:
+                  detailInfo[item.value] === '正常'
+                    ? '#3cc53c'
+                    : detailInfo[item.value] === '离线'
+                    ? 'rgb(238, 182, 78)'
+                    : detailInfo[item.value] === '异常'
+                    ? 'red'
+                    : detailInfo[item.value] === '未监控'
+                    ? '#a39f9f'
+                    : '#a39f9f'
+              }"
+              >{{ detailInfo[item.value] || '' }}</span
+            >
+          </div>
 
-          <div v-if="item.text === '燃气浓度' && gasData.length" class="value" style="width: 80%;">
+          <!-- 燃气浓度 -->
+          <div
+            v-if="item.text === '燃气浓度' && gasData.length"
+            class="value"
+            style="width: 80%;margin-left: 10px;"
+          >
             <div v-for="item in gasData" v-show="item.text" :key="item.name">
-              {{ item.text }} :
-              <span :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.name.includes('燃气') || item.name.includes('哨兵') ? item.value
-                : item.stateName }}</span>
-              <span v-if="item.name.includes('燃气')" :class="`${item.state === '1' ? '' : 'error'}`"> {{ item.unit
-              }}</span>
-              <el-button v-if="item.name.includes('燃气')" size="small" style="margin-left: 10px;" @click="more">
+              {{ item.name }} :
+              <span :class="`${item.state === '1' ? '' : 'error'}`">
+                {{
+                  item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')
+                    ? item.value
+                    : item.stateName
+                }}</span
+              >
+              <span
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                :class="`${item.state === '1' ? '' : 'error'}`"
+              >
+                {{ item.unit }}</span
+              >
+              <el-button
+                v-if="item.name.includes('燃气') || item.name.includes('哨兵') || item.name.includes('智能警示桩')"
+                size="small"
+                style="margin-left: 10px"
+                @click="more"
+              >
                 更多
               </el-button>
             </div>
@@ -301,7 +423,9 @@
       flex-wrap: wrap;
       box-sizing: border-box;
       padding: 6px 0;
-
+      .last-value {
+        width: 100% !important;
+      }
       .descriptions-item {
         width: 48%;
         margin: 4px 5px;
@@ -312,7 +436,9 @@
         .label-no {
           width: 28% !important;
         }
-
+        .last-label {
+          width: 16% !important;
+        }
         .label {
           width: 34%;
           box-sizing: border-box;
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
new file mode 100644
index 0000000..fa91c9e
--- /dev/null
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -0,0 +1,312 @@
+<script lang="ts" setup name="GasDialog">
+// import monitorDataGasList from './monitorDataGasList.vue'
+import dayjs from 'dayjs'
+// import { getMonitorData } from '@/api/home/pipeline/pipeline'
+import { getDataSearch } from '@/api/home/device/device'
+import { toHumpObject } from '@/utils/String'
+const dialogFormVisible = ref(false)
+// const wellId = ref('')
+// 初始化对话框
+// const gasRef = ref()
+const initDialog = (row: any) => {
+  console.log(row)
+  // wellId.value = id
+  if (row.deviceTypeName === '燃气智能监测终端') {
+    columns.value = columns1.value
+  } else if (row.deviceTypeName === '管网哨兵') {
+    columns.value = columns2.value
+  } else if (row.deviceTypeName === '智能警示桩') {
+    columns.value = columns3.value
+  } else if (row.deviceTypeName === '场站监测云台') {
+    columns.value = columns4.value
+  }
+  dialogFormVisible.value = true
+  listQuery.value.devcode = row.deviceCode
+  listQuery.value.typeName = row.deviceTypeName
+  datetimerange1.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  datetimerange2.value = [
+    dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().format('YYYY-MM-DD HH:mm:ss')
+  ]
+  setTimeout(() => {
+    fetchData()
+  })
+  // nextTick(() => {
+  //   gasRef.value.switchView()
+  // })
+}
+defineExpose({
+  initDialog
+})
+
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+// 列表loading
+const loadingTable = ref(true)
+//  列表展示数据
+const list = ref([])
+//  列表展示列
+const columns = ref<any>([])
+// 燃气智能监测终端
+const columns1 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'strength', align: 'center' },
+  { text: '电量(%)', value: 'cell', align: 'center' },
+  { text: '信号强度', value: 'pci', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 管网哨兵
+const columns2 = ref<any>([
+  { text: '设备编号', value: 'devcode', align: 'center' },
+  { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 智能警示桩
+const columns3 = ref<any>([
+  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '110' },
+  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '110' },
+  { text: '电池电压(V)', value: 'vbat', align: 'center', width: '110' },
+  {
+    text: '桩倾斜报警',
+    value: 'pipeInclineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '桩拆卸报警',
+    value: 'pipeBreakAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左断线报警',
+    value: 'leftOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '左振动报警',
+    value: 'leftVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右断线报警',
+    value: 'rightOffLineAlarm',
+    align: 'center',
+    width: '110'
+  },
+  {
+    text: '右振动报警',
+    value: 'rightVibrateAlarm',
+    align: 'center',
+    width: '110'
+  },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+// 场站监测云台
+const columns4 = ref<any>([
+  { text: '设备编号', value: 'deviceCode', align: 'center' },
+  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '水平位置', value: 'dircetion', align: 'center' },
+  { text: '垂直位置', value: 'pitch', align: 'center' },
+  { text: '采集时间', value: 'uptime', align: 'center' },
+  { text: '上传时间', value: 'logtime', align: 'center' }
+])
+
+const listQuery = ref({
+  devcode: '',
+  logBegTime: '',
+  logEndTime: '',
+  typeName: '',
+  upBegTime: '',
+  upEndTime: ''
+})
+// 开始结束时间
+const datetimerange1 = ref()
+watch(
+  () => datetimerange1.value,
+  newVal => {
+    listQuery.value.upBegTime = ''
+    listQuery.value.upEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.upBegTime = `${newVal[0]}`
+        listQuery.value.upEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const datetimerange2 = ref()
+watch(
+  () => datetimerange2.value,
+  newVal => {
+    listQuery.value.logBegTime = ''
+    listQuery.value.logEndTime = ''
+    if (Array.isArray(newVal)) {
+      if (newVal.length) {
+        listQuery.value.logBegTime = `${newVal[0]}`
+        listQuery.value.logEndTime = `${newVal[1]}`
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const fetchData = () => {
+  loadingTable.value = true
+  // listQuery.value.devcode = $route.query.deviceCode as string
+  // listQuery.value.typeName = $route.query.typeName as string
+  getDataSearch(listQuery.value)
+    .then(res => {
+      // list.value = res.data.map((item: any) => {
+      //   for (const i in item) {
+      //     if (i.includes('ALARM')) {
+      //       if (i === 'PICTURE_ALARM') {
+      //         item[i] = item[i] === '0' ? '/' : item[i]
+      //       }
+      //       else {
+      //         item[i] = item[i] === '0' ? '正常' : '报警'
+      //       }
+      //     }
+      //   }
+      //   return item
+      // })
+      list.value = res.data.map((item: any) => toHumpObject(item))
+      loadingTable.value = false
+    })
+    .catch(() => {
+      loadingTable.value = false
+    })
+}
+// onMounted(() => {
+//   datetimerange1.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   datetimerange2.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+//   setTimeout(() => {
+//     fetchData()
+//   })
+// })
+// 是否展示表格
+const isShowTable = ref(true)
+// 切换视图
+const switchView = () => {
+  isShowTable.value = !isShowTable.value
+  if (!isShowTable.value) {
+    resizePage()
+  }
+}
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogFormVisible"
+    title="燃气浓度"
+    append-to-body
+    width="1100px"
+  >
+    <table-container title="">
+      <template #btns-left>
+        <!-- 查询条件 -->
+        <div style="display: flex; align-items: center">
+          <span style="margin-right: 5px; white-space: nowrap">采集时间:</span>
+          <el-date-picker
+            v-model="datetimerange1"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="采集开始时间"
+            end-placeholder="采集结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <span
+            style="margin-right: 5px; margin-left: 10px; white-space: nowrap"
+            >上传时间:</span
+          >
+          <el-date-picker
+            v-model="datetimerange2"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="上传开始时间"
+            end-placeholder="上传结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            @click="fetchData"
+          >
+            搜索
+          </el-button>
+        </div>
+      </template>
+      <normal-table
+        v-show="isShowTable"
+        :data="list"
+        :total="0"
+        :columns="columns"
+        :query="{}"
+        :list-loading="loadingTable"
+        :pagination="false"
+      />
+    </table-container>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="cancel"> 关闭 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.body {
+  width: 100%;
+
+  ::v-deep(.table-container) {
+    .button-area {
+      .custom {
+        width: 100%;
+      }
+    }
+  }
+}
+
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+
+// .body {
+//   ::v-deep(.button-left) {
+//     width: 100%;
+//   }
+// }
+::v-deep(.table-container) {
+  .button-left {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index 6e04960..d1cda40 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -72,7 +72,7 @@
       url: `${publicPath}/image/pipeline/underground-normal.png`, // 图标地址
       anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      zIndex: 100, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
       url: `${publicPath}/image/pipeline/地埋式哨兵-异常.png`, // 图标地址
@@ -90,7 +90,7 @@
       url: `${publicPath}/image/pipeline/warning-normal.png`, // 图标地址
       anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      zIndex: 100, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
       url: `${publicPath}/image/pipeline/警示桩-异常.png`, // 图标地址
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 1f7a2f9..4e6ad56 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -34,7 +34,7 @@
   { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
-  { text: '使用状态', value: 'onState', align: 'center', width: '90' },
+  { text: '在用状态', value: 'onState', align: 'center', width: '90' },
   { text: '监控状态', value: 'monitorState', align: 'center' },
 ])
 // 最终展示列
@@ -80,9 +80,9 @@
         lat: item.latGaode,
         lng: item.lngGaode,
         id: item.id,
-        status: item.onState === '投用' ? '1' : '0',
+        status: item.monitorState === '正常' ? '1' : '0',
       }))
-      console.log(mapList.value, 'mapList.value')
+      // console.log(mapList.value, 'mapList.value')
       setTimeout(() => {
         if (tableFlag.value === 'map') {
           mapRef.value.resetDraw()
@@ -126,6 +126,7 @@
       id: item.LEDGER_ID,
       status: item.ONLINE_STATE,
     }))
+    // console.log(mapList.value.filter(item => item.lng === '116.7069320679'), '561246664433')
     setTimeout(() => {
       if (tableFlag.value === 'map') {
         mapRef.value.resetDraw()
@@ -170,7 +171,7 @@
 const monitorStateList = ref<{ id: string; name: string; value: string }[]>([]) // 监控状态
 const fetchDict = () => {
   // 使用状态
-  getDictByCode('onState').then((res) => {
+  getDictByCode('onUseStatus').then((res) => {
     onStateList.value = res.data
   })
   // 监控状态
@@ -370,7 +371,7 @@
         </el-select>
       </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.onState" placeholder="使用状态" clearable class="select" style="width: 160px !important;">
+        <el-select v-model="listQuery.onState" placeholder="在用状态" clearable class="select" style="width: 160px !important;">
           <el-option v-for="item in onStateList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index e62199c..0eaaf34 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -25,7 +25,7 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警名称', value: 'alarmName', align: 'center', isRequire: false },
+  { text: '报警名称', value: 'alarmName', align: 'center', isRequired: false },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
   { text: '设备类型', value: 'typeName', align: 'center' },
   { text: '产品', value: 'productName', align: 'center' },
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index a85c8f7..9cdfa8c 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -75,7 +75,7 @@
   loadingTable.value = true
   listQuery.value.wellId = $route.query.id as string || $props.id
   getMonitorData(listQuery.value).then((res) => {
-    list.value = res.data['燃气智能监测终端'] || res.data['燃气智能监测终端（一体化）'] || []
+    list.value = res.data['燃气智能监测终端'] || res.data['燃气智能监测终端（一体化）'] || res.data['管网哨兵'] ||  []
     loadingTable.value = false
     xAxisData.value = list.value.slice().reverse().map((item: any) => item.logtime)
     data.value = [