diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 821c3f0..5e0020a 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -11,6 +11,7 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -18,6 +19,7 @@
 const list = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 const chartData = ref<any[]>([])
+const manufactureName = ref('')
 //  列表展示列
 const columns = ref<any>([])
 // 燃气智能监测终端
@@ -44,9 +46,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -56,8 +58,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -164,7 +166,7 @@
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
-      // chartData.value = []
+
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
           if ((res1.data || []).length) {
@@ -267,6 +269,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
@@ -287,11 +306,12 @@
     // 获取设备信息
     getDeviceListPage({ offset: 1, limit: 1, devCode: $route.query.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        // const manufactureName = res.data.rows[0].manufactureName
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -352,7 +372,8 @@
         <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
-        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+          @click="exportList">
           导出
         </el-button>
       </div>

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 821c3f0..5e0020a 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -11,6 +11,7 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -18,6 +19,7 @@
 const list = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 const chartData = ref<any[]>([])
+const manufactureName = ref('')
 //  列表展示列
 const columns = ref<any>([])
 // 燃气智能监测终端
@@ -44,9 +46,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -56,8 +58,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -164,7 +166,7 @@
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
-      // chartData.value = []
+
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
           if ((res1.data || []).length) {
@@ -267,6 +269,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
@@ -287,11 +306,12 @@
     // 获取设备信息
     getDeviceListPage({ offset: 1, limit: 1, devCode: $route.query.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        // const manufactureName = res.data.rows[0].manufactureName
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -352,7 +372,8 @@
         <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
-        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+          @click="exportList">
           导出
         </el-button>
       </div>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index df8dec7..ae1ee20 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -232,6 +232,9 @@
     else {
       alarmEventList.value = []
     }
+    if (!isFisrst.value) {
+      dataForm.value.alarmThreshold = ''
+    }
   }
 }, {
   deep: true,
@@ -239,7 +242,7 @@
 })
 const currentProduct = ref<any>({})
 watch(() => dataForm.value.productId, (newVal) => {
-  if(newVal) {
+  if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
     console.log(currentProduct.value, 'currentProduct.value')
   }
@@ -258,6 +261,13 @@
   deep: true,
   immediate: true,
 })
+// watch(() => dataForm.value.alarmThreshold, (newVal) => {
+//   if (newVal) {
+//     if (!isFisrst.value) {
+//       dataForm.value.alarmThreshold = ''
+//     }
+//   }
+// })
 </script>
 
 <template>
@@ -318,8 +328,9 @@
         <!-- 系统 -->
         <el-col v-if="dataForm.alarmJudgeMethod === '1'" :span="12">
           <el-form-item label="报警阈值" prop="alarmThreshold">
-            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number" style="width: 50%;" />
-            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL'}}
+            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number"
+              style="width: 50%;" />
+            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL' }}
           </el-form-item>
         </el-col>
         <!-- 设备 -->

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 821c3f0..5e0020a 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -11,6 +11,7 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -18,6 +19,7 @@
 const list = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 const chartData = ref<any[]>([])
+const manufactureName = ref('')
 //  列表展示列
 const columns = ref<any>([])
 // 燃气智能监测终端
@@ -44,9 +46,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -56,8 +58,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -164,7 +166,7 @@
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
-      // chartData.value = []
+
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
           if ((res1.data || []).length) {
@@ -267,6 +269,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
@@ -287,11 +306,12 @@
     // 获取设备信息
     getDeviceListPage({ offset: 1, limit: 1, devCode: $route.query.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        // const manufactureName = res.data.rows[0].manufactureName
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -352,7 +372,8 @@
         <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
-        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+          @click="exportList">
           导出
         </el-button>
       </div>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index df8dec7..ae1ee20 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -232,6 +232,9 @@
     else {
       alarmEventList.value = []
     }
+    if (!isFisrst.value) {
+      dataForm.value.alarmThreshold = ''
+    }
   }
 }, {
   deep: true,
@@ -239,7 +242,7 @@
 })
 const currentProduct = ref<any>({})
 watch(() => dataForm.value.productId, (newVal) => {
-  if(newVal) {
+  if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
     console.log(currentProduct.value, 'currentProduct.value')
   }
@@ -258,6 +261,13 @@
   deep: true,
   immediate: true,
 })
+// watch(() => dataForm.value.alarmThreshold, (newVal) => {
+//   if (newVal) {
+//     if (!isFisrst.value) {
+//       dataForm.value.alarmThreshold = ''
+//     }
+//   }
+// })
 </script>
 
 <template>
@@ -318,8 +328,9 @@
         <!-- 系统 -->
         <el-col v-if="dataForm.alarmJudgeMethod === '1'" :span="12">
           <el-form-item label="报警阈值" prop="alarmThreshold">
-            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number" style="width: 50%;" />
-            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL'}}
+            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number"
+              style="width: 50%;" />
+            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL' }}
           </el-form-item>
         </el-col>
         <!-- 设备 -->
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 2ce1653..5196d54 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -60,18 +60,31 @@
     ElMessage.warning('获取设备ID失败')
   })
 }
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const loading = ref(false)
 // 点击树形结构
 const handleNodeClick = (data: any, node: any) => {
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
-    console.log(data, '点击')
+    // console.log(data, '点击')
     const deviceCode = data.DEVICECODE
+    // const deviceCode = 'WXD7507'
     if (deviceCode) {
+      loading.value = true
       clearInterval(timer.value)
       timer.value = null
       playerVideo(deviceCode)
       // 更新echarts
-
+      fetchEchartsData({
+        devCode: deviceCode,
+        begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
     }
     else {
       ElMessage.warning('缺少设备编号')
@@ -89,17 +102,19 @@
 const fetchTreeData = () => {
   loadingTree.value = true
   const setData = (data1: any[], data2: any[]) => {
-    const data = data2.filter((item: any) => item.DEPTID).map((item: any) => ({
+    const data = data2.filter((item: any) => item.DEPTID).map((item: any, index: number) => ({
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}-${index}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}-${index}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
       pid: item.DEPTID,
       value: '',
     }))
+    console.log(data)
     const all = [...data1, ...data]
     expandedKeys.value = []
     all.forEach(element => {
@@ -108,19 +123,6 @@
       }
     })
     treeData.value = toTreeList(all, '0', true)
-    // 设置默认选中
-    // setTimeout(() => {
-    //   if(data.length) {
-    //     console.log(data[0], 'data[0]')
-    //     console.log(data[1], 'data[0]')
-    //     treeRef.value.setCurrentKey(data[0].id)
-    //     nextTick(() => {
-    //       treeRef.value.scrollToNode(data[0].id)
-    //       // 播放视频
-
-    //     })
-    //   }
-    // })
   }
   const fetch = async () => {
     try {
@@ -135,6 +137,7 @@
     }
   }
   indexDB.getAll().then(allData => {
+    loadingTree.value = true
     if (allData.filter((item: any) => item.name === 'all-dept-list').length) {
       const list = JSON.parse(allData.filter((item: any) => item.name === 'all-dept-list')[0].data).filter((item: any) => item.id !== '0')
       if (allData.filter((item: any) => item.name === 'all-video-list').length) {
@@ -148,6 +151,7 @@
     }
     else {
       fetch()
+      loadingTree.value = false
     }
   })
 
@@ -173,16 +177,17 @@
   window.addEventListener('resize', () => { })
 })
 // 获取echarts数据
-const fetchEchartsData = (obj: any) => {
+function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).reverse().map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).reverse().map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
+    resizePage()
     if (!timer.value && xAxisData.value.length) {
       if (timer.value) {
         clearInterval(timer.value)
@@ -190,12 +195,21 @@
       }
       timer.value = setInterval(() => {
         fetchEchartsData({ ...obj, begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs().format('YYYY-MM-DD HH:mm:ss') })
-      }, 1000 * 60 *20);
+      }, 1000 * 60 * 20);
     }
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
   })
 }
 const currentConcentration = computed(() => {
-  return data.value[0]?.data.length ? data.value[0]?.data.CONCENTRATION : ''
+  if (data.value[0]?.data.length) {
+    const length = data.value[0]?.data.length
+    return data.value[0]?.data[length - 1]
+  }
+  else {
+    return ''
+  }
 })
 // 视频播放失败
 const playerError = (info: string) => {
@@ -203,13 +217,6 @@
 }
 const iWidth = ref(window.innerWidth - 180)
 const iHeight = ref(window.innerHeight * 0.55)
-// console.log(iWidth, iHeight)
-const resizePage = () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 200)
-}
 const complete = () => {
   resizePage()
 }
@@ -227,7 +234,7 @@
       <!-- 左侧组织机构 -->
       <div class="left-container">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always">
+          <el-card v-loading="loadingTree" class="box-card" shadow="always">
             <template #header>
               <div class="clearfix">
                 <!-- <div>监控点列表</div> -->
@@ -261,7 +268,7 @@
                 <span>当前浓度：{{ currentConcentration }}PPM.M</span>
                 <!-- <span style="margin-left: 50px;">报警阈值：50%LEL</span> -->
               </div>
-              <div class="chart">
+              <div class="chart" v-loading="loading">
                 <line-chart v-show="xAxisData.length" :x-axis-data="xAxisData" :data="data" :gradient="false"
                   :smooth="false" unit="%LEL"
                   :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }" />

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 821c3f0..5e0020a 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -11,6 +11,7 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -18,6 +19,7 @@
 const list = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 const chartData = ref<any[]>([])
+const manufactureName = ref('')
 //  列表展示列
 const columns = ref<any>([])
 // 燃气智能监测终端
@@ -44,9 +46,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -56,8 +58,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -164,7 +166,7 @@
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
-      // chartData.value = []
+
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
           if ((res1.data || []).length) {
@@ -267,6 +269,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
@@ -287,11 +306,12 @@
     // 获取设备信息
     getDeviceListPage({ offset: 1, limit: 1, devCode: $route.query.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        // const manufactureName = res.data.rows[0].manufactureName
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -352,7 +372,8 @@
         <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
-        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+          @click="exportList">
           导出
         </el-button>
       </div>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index df8dec7..ae1ee20 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -232,6 +232,9 @@
     else {
       alarmEventList.value = []
     }
+    if (!isFisrst.value) {
+      dataForm.value.alarmThreshold = ''
+    }
   }
 }, {
   deep: true,
@@ -239,7 +242,7 @@
 })
 const currentProduct = ref<any>({})
 watch(() => dataForm.value.productId, (newVal) => {
-  if(newVal) {
+  if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
     console.log(currentProduct.value, 'currentProduct.value')
   }
@@ -258,6 +261,13 @@
   deep: true,
   immediate: true,
 })
+// watch(() => dataForm.value.alarmThreshold, (newVal) => {
+//   if (newVal) {
+//     if (!isFisrst.value) {
+//       dataForm.value.alarmThreshold = ''
+//     }
+//   }
+// })
 </script>
 
 <template>
@@ -318,8 +328,9 @@
         <!-- 系统 -->
         <el-col v-if="dataForm.alarmJudgeMethod === '1'" :span="12">
           <el-form-item label="报警阈值" prop="alarmThreshold">
-            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number" style="width: 50%;" />
-            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL'}}
+            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number"
+              style="width: 50%;" />
+            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL' }}
           </el-form-item>
         </el-col>
         <!-- 设备 -->
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 2ce1653..5196d54 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -60,18 +60,31 @@
     ElMessage.warning('获取设备ID失败')
   })
 }
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const loading = ref(false)
 // 点击树形结构
 const handleNodeClick = (data: any, node: any) => {
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
-    console.log(data, '点击')
+    // console.log(data, '点击')
     const deviceCode = data.DEVICECODE
+    // const deviceCode = 'WXD7507'
     if (deviceCode) {
+      loading.value = true
       clearInterval(timer.value)
       timer.value = null
       playerVideo(deviceCode)
       // 更新echarts
-
+      fetchEchartsData({
+        devCode: deviceCode,
+        begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
     }
     else {
       ElMessage.warning('缺少设备编号')
@@ -89,17 +102,19 @@
 const fetchTreeData = () => {
   loadingTree.value = true
   const setData = (data1: any[], data2: any[]) => {
-    const data = data2.filter((item: any) => item.DEPTID).map((item: any) => ({
+    const data = data2.filter((item: any) => item.DEPTID).map((item: any, index: number) => ({
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}-${index}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}-${index}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
       pid: item.DEPTID,
       value: '',
     }))
+    console.log(data)
     const all = [...data1, ...data]
     expandedKeys.value = []
     all.forEach(element => {
@@ -108,19 +123,6 @@
       }
     })
     treeData.value = toTreeList(all, '0', true)
-    // 设置默认选中
-    // setTimeout(() => {
-    //   if(data.length) {
-    //     console.log(data[0], 'data[0]')
-    //     console.log(data[1], 'data[0]')
-    //     treeRef.value.setCurrentKey(data[0].id)
-    //     nextTick(() => {
-    //       treeRef.value.scrollToNode(data[0].id)
-    //       // 播放视频
-
-    //     })
-    //   }
-    // })
   }
   const fetch = async () => {
     try {
@@ -135,6 +137,7 @@
     }
   }
   indexDB.getAll().then(allData => {
+    loadingTree.value = true
     if (allData.filter((item: any) => item.name === 'all-dept-list').length) {
       const list = JSON.parse(allData.filter((item: any) => item.name === 'all-dept-list')[0].data).filter((item: any) => item.id !== '0')
       if (allData.filter((item: any) => item.name === 'all-video-list').length) {
@@ -148,6 +151,7 @@
     }
     else {
       fetch()
+      loadingTree.value = false
     }
   })
 
@@ -173,16 +177,17 @@
   window.addEventListener('resize', () => { })
 })
 // 获取echarts数据
-const fetchEchartsData = (obj: any) => {
+function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).reverse().map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).reverse().map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
+    resizePage()
     if (!timer.value && xAxisData.value.length) {
       if (timer.value) {
         clearInterval(timer.value)
@@ -190,12 +195,21 @@
       }
       timer.value = setInterval(() => {
         fetchEchartsData({ ...obj, begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs().format('YYYY-MM-DD HH:mm:ss') })
-      }, 1000 * 60 *20);
+      }, 1000 * 60 * 20);
     }
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
   })
 }
 const currentConcentration = computed(() => {
-  return data.value[0]?.data.length ? data.value[0]?.data.CONCENTRATION : ''
+  if (data.value[0]?.data.length) {
+    const length = data.value[0]?.data.length
+    return data.value[0]?.data[length - 1]
+  }
+  else {
+    return ''
+  }
 })
 // 视频播放失败
 const playerError = (info: string) => {
@@ -203,13 +217,6 @@
 }
 const iWidth = ref(window.innerWidth - 180)
 const iHeight = ref(window.innerHeight * 0.55)
-// console.log(iWidth, iHeight)
-const resizePage = () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 200)
-}
 const complete = () => {
   resizePage()
 }
@@ -227,7 +234,7 @@
       <!-- 左侧组织机构 -->
       <div class="left-container">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always">
+          <el-card v-loading="loadingTree" class="box-card" shadow="always">
             <template #header>
               <div class="clearfix">
                 <!-- <div>监控点列表</div> -->
@@ -261,7 +268,7 @@
                 <span>当前浓度：{{ currentConcentration }}PPM.M</span>
                 <!-- <span style="margin-left: 50px;">报警阈值：50%LEL</span> -->
               </div>
-              <div class="chart">
+              <div class="chart" v-loading="loading">
                 <line-chart v-show="xAxisData.length" :x-axis-data="xAxisData" :data="data" :gradient="false"
                   :smooth="false" unit="%LEL"
                   :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }" />
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index ef2bd48..b6f59b3 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -221,6 +221,7 @@
 const changeVideo = (item: any) => {
   currentVideo.value = item.name
   // 切换云台播放
+  unref(playRef).playerFun.stopAllPlay()
   videoType.value = 'real'
   playerVideo(item.devcode)
 }

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 821c3f0..5e0020a 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -11,6 +11,7 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -18,6 +19,7 @@
 const list = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 const chartData = ref<any[]>([])
+const manufactureName = ref('')
 //  列表展示列
 const columns = ref<any>([])
 // 燃气智能监测终端
@@ -44,9 +46,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -56,8 +58,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -164,7 +166,7 @@
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
-      // chartData.value = []
+
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
           if ((res1.data || []).length) {
@@ -267,6 +269,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
@@ -287,11 +306,12 @@
     // 获取设备信息
     getDeviceListPage({ offset: 1, limit: 1, devCode: $route.query.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        // const manufactureName = res.data.rows[0].manufactureName
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -352,7 +372,8 @@
         <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
-        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+          @click="exportList">
           导出
         </el-button>
       </div>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index df8dec7..ae1ee20 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -232,6 +232,9 @@
     else {
       alarmEventList.value = []
     }
+    if (!isFisrst.value) {
+      dataForm.value.alarmThreshold = ''
+    }
   }
 }, {
   deep: true,
@@ -239,7 +242,7 @@
 })
 const currentProduct = ref<any>({})
 watch(() => dataForm.value.productId, (newVal) => {
-  if(newVal) {
+  if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
     console.log(currentProduct.value, 'currentProduct.value')
   }
@@ -258,6 +261,13 @@
   deep: true,
   immediate: true,
 })
+// watch(() => dataForm.value.alarmThreshold, (newVal) => {
+//   if (newVal) {
+//     if (!isFisrst.value) {
+//       dataForm.value.alarmThreshold = ''
+//     }
+//   }
+// })
 </script>
 
 <template>
@@ -318,8 +328,9 @@
         <!-- 系统 -->
         <el-col v-if="dataForm.alarmJudgeMethod === '1'" :span="12">
           <el-form-item label="报警阈值" prop="alarmThreshold">
-            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number" style="width: 50%;" />
-            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL'}}
+            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number"
+              style="width: 50%;" />
+            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL' }}
           </el-form-item>
         </el-col>
         <!-- 设备 -->
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 2ce1653..5196d54 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -60,18 +60,31 @@
     ElMessage.warning('获取设备ID失败')
   })
 }
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const loading = ref(false)
 // 点击树形结构
 const handleNodeClick = (data: any, node: any) => {
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
-    console.log(data, '点击')
+    // console.log(data, '点击')
     const deviceCode = data.DEVICECODE
+    // const deviceCode = 'WXD7507'
     if (deviceCode) {
+      loading.value = true
       clearInterval(timer.value)
       timer.value = null
       playerVideo(deviceCode)
       // 更新echarts
-
+      fetchEchartsData({
+        devCode: deviceCode,
+        begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
     }
     else {
       ElMessage.warning('缺少设备编号')
@@ -89,17 +102,19 @@
 const fetchTreeData = () => {
   loadingTree.value = true
   const setData = (data1: any[], data2: any[]) => {
-    const data = data2.filter((item: any) => item.DEPTID).map((item: any) => ({
+    const data = data2.filter((item: any) => item.DEPTID).map((item: any, index: number) => ({
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}-${index}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}-${index}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
       pid: item.DEPTID,
       value: '',
     }))
+    console.log(data)
     const all = [...data1, ...data]
     expandedKeys.value = []
     all.forEach(element => {
@@ -108,19 +123,6 @@
       }
     })
     treeData.value = toTreeList(all, '0', true)
-    // 设置默认选中
-    // setTimeout(() => {
-    //   if(data.length) {
-    //     console.log(data[0], 'data[0]')
-    //     console.log(data[1], 'data[0]')
-    //     treeRef.value.setCurrentKey(data[0].id)
-    //     nextTick(() => {
-    //       treeRef.value.scrollToNode(data[0].id)
-    //       // 播放视频
-
-    //     })
-    //   }
-    // })
   }
   const fetch = async () => {
     try {
@@ -135,6 +137,7 @@
     }
   }
   indexDB.getAll().then(allData => {
+    loadingTree.value = true
     if (allData.filter((item: any) => item.name === 'all-dept-list').length) {
       const list = JSON.parse(allData.filter((item: any) => item.name === 'all-dept-list')[0].data).filter((item: any) => item.id !== '0')
       if (allData.filter((item: any) => item.name === 'all-video-list').length) {
@@ -148,6 +151,7 @@
     }
     else {
       fetch()
+      loadingTree.value = false
     }
   })
 
@@ -173,16 +177,17 @@
   window.addEventListener('resize', () => { })
 })
 // 获取echarts数据
-const fetchEchartsData = (obj: any) => {
+function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).reverse().map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).reverse().map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
+    resizePage()
     if (!timer.value && xAxisData.value.length) {
       if (timer.value) {
         clearInterval(timer.value)
@@ -190,12 +195,21 @@
       }
       timer.value = setInterval(() => {
         fetchEchartsData({ ...obj, begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs().format('YYYY-MM-DD HH:mm:ss') })
-      }, 1000 * 60 *20);
+      }, 1000 * 60 * 20);
     }
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
   })
 }
 const currentConcentration = computed(() => {
-  return data.value[0]?.data.length ? data.value[0]?.data.CONCENTRATION : ''
+  if (data.value[0]?.data.length) {
+    const length = data.value[0]?.data.length
+    return data.value[0]?.data[length - 1]
+  }
+  else {
+    return ''
+  }
 })
 // 视频播放失败
 const playerError = (info: string) => {
@@ -203,13 +217,6 @@
 }
 const iWidth = ref(window.innerWidth - 180)
 const iHeight = ref(window.innerHeight * 0.55)
-// console.log(iWidth, iHeight)
-const resizePage = () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 200)
-}
 const complete = () => {
   resizePage()
 }
@@ -227,7 +234,7 @@
       <!-- 左侧组织机构 -->
       <div class="left-container">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always">
+          <el-card v-loading="loadingTree" class="box-card" shadow="always">
             <template #header>
               <div class="clearfix">
                 <!-- <div>监控点列表</div> -->
@@ -261,7 +268,7 @@
                 <span>当前浓度：{{ currentConcentration }}PPM.M</span>
                 <!-- <span style="margin-left: 50px;">报警阈值：50%LEL</span> -->
               </div>
-              <div class="chart">
+              <div class="chart" v-loading="loading">
                 <line-chart v-show="xAxisData.length" :x-axis-data="xAxisData" :data="data" :gradient="false"
                   :smooth="false" unit="%LEL"
                   :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }" />
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index ef2bd48..b6f59b3 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -221,6 +221,7 @@
 const changeVideo = (item: any) => {
   currentVideo.value = item.name
   // 切换云台播放
+  unref(playRef).playerFun.stopAllPlay()
   videoType.value = 'real'
   playerVideo(item.devcode)
 }
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index 17bb85d..e72282f 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -7,12 +7,14 @@
 import dayjs from 'dayjs'
 import { getDeviceGasData } from '@/api/home/station/station'
 import { getAlarmThresholdByCode } from '@/api/home/device/device'
+import { ElMessage } from 'element-plus'
 const $props = defineProps({
   devcode: {
     type: String,
     required: true,
   }
 })
+const emits = defineEmits(['playback'])
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(false)
@@ -67,18 +69,8 @@
   }).then(res => {
     // console.log(res.data, '123123')
     list.value = (res.data || []).reverse()
-    // list.value = [
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '11100.00',
-    //   },
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '1110.00',
-    //   },
-    // ]
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME)
+      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -106,7 +98,7 @@
       data.value = [
         {
           name: '浓度',
-          data: list.value.map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -162,10 +154,6 @@
     resizePage()
   }
 }
-// 查看
-const detail = (row: any) => {
-
-}
 
 watch(() => $props.devcode, (newVal) => {
   if (newVal) {
@@ -222,10 +210,23 @@
     else {
       setTimeout(() => {
         fetchData(true)
-      }, 1000 * 60 *5)
+      }, 1000 * 60 * 5)
     }
   }
 }
+
+// 回放
+const playback = (row: any) => {
+  if (!row.LOGTIME) {
+    ElMessage.warning('该数据无时间')
+    return
+  }
+  const obj = {
+    start: dayjs(row.LOGTIME).subtract(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+    end: dayjs(row.LOGTIME).add(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+  }
+  emits('playback', obj)
+}
 </script>
 
 <template>
@@ -256,7 +257,7 @@
       <template #columns>
         <el-table-column label="操作" align="center" width="70">
           <template #default="scope">
-            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="detail(scope.row)">
+            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="playback(scope.row)">
               回放
             </el-button>
           </template>
@@ -264,7 +265,8 @@
       </template>
     </normal-table>
     <div v-show="!isShowTable" style="width: 100%;height: 370px;">
-      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
+      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false"
+        :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
         :grid="{
           top: 50,
@@ -273,7 +275,7 @@
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
-        <el-empty v-show="!list.length" description="暂无数据" />
+      <el-empty v-show="!list.length" description="暂无数据" />
     </div>
   </table-container>
 </template>

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 821c3f0..5e0020a 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -11,6 +11,7 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -18,6 +19,7 @@
 const list = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 const chartData = ref<any[]>([])
+const manufactureName = ref('')
 //  列表展示列
 const columns = ref<any>([])
 // 燃气智能监测终端
@@ -44,9 +46,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -56,8 +58,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -164,7 +166,7 @@
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
-      // chartData.value = []
+
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
           if ((res1.data || []).length) {
@@ -267,6 +269,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
@@ -287,11 +306,12 @@
     // 获取设备信息
     getDeviceListPage({ offset: 1, limit: 1, devCode: $route.query.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        // const manufactureName = res.data.rows[0].manufactureName
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -352,7 +372,8 @@
         <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
-        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+          @click="exportList">
           导出
         </el-button>
       </div>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index df8dec7..ae1ee20 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -232,6 +232,9 @@
     else {
       alarmEventList.value = []
     }
+    if (!isFisrst.value) {
+      dataForm.value.alarmThreshold = ''
+    }
   }
 }, {
   deep: true,
@@ -239,7 +242,7 @@
 })
 const currentProduct = ref<any>({})
 watch(() => dataForm.value.productId, (newVal) => {
-  if(newVal) {
+  if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
     console.log(currentProduct.value, 'currentProduct.value')
   }
@@ -258,6 +261,13 @@
   deep: true,
   immediate: true,
 })
+// watch(() => dataForm.value.alarmThreshold, (newVal) => {
+//   if (newVal) {
+//     if (!isFisrst.value) {
+//       dataForm.value.alarmThreshold = ''
+//     }
+//   }
+// })
 </script>
 
 <template>
@@ -318,8 +328,9 @@
         <!-- 系统 -->
         <el-col v-if="dataForm.alarmJudgeMethod === '1'" :span="12">
           <el-form-item label="报警阈值" prop="alarmThreshold">
-            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number" style="width: 50%;" />
-            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL'}}
+            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number"
+              style="width: 50%;" />
+            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL' }}
           </el-form-item>
         </el-col>
         <!-- 设备 -->
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 2ce1653..5196d54 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -60,18 +60,31 @@
     ElMessage.warning('获取设备ID失败')
   })
 }
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const loading = ref(false)
 // 点击树形结构
 const handleNodeClick = (data: any, node: any) => {
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
-    console.log(data, '点击')
+    // console.log(data, '点击')
     const deviceCode = data.DEVICECODE
+    // const deviceCode = 'WXD7507'
     if (deviceCode) {
+      loading.value = true
       clearInterval(timer.value)
       timer.value = null
       playerVideo(deviceCode)
       // 更新echarts
-
+      fetchEchartsData({
+        devCode: deviceCode,
+        begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
     }
     else {
       ElMessage.warning('缺少设备编号')
@@ -89,17 +102,19 @@
 const fetchTreeData = () => {
   loadingTree.value = true
   const setData = (data1: any[], data2: any[]) => {
-    const data = data2.filter((item: any) => item.DEPTID).map((item: any) => ({
+    const data = data2.filter((item: any) => item.DEPTID).map((item: any, index: number) => ({
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}-${index}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}-${index}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
       pid: item.DEPTID,
       value: '',
     }))
+    console.log(data)
     const all = [...data1, ...data]
     expandedKeys.value = []
     all.forEach(element => {
@@ -108,19 +123,6 @@
       }
     })
     treeData.value = toTreeList(all, '0', true)
-    // 设置默认选中
-    // setTimeout(() => {
-    //   if(data.length) {
-    //     console.log(data[0], 'data[0]')
-    //     console.log(data[1], 'data[0]')
-    //     treeRef.value.setCurrentKey(data[0].id)
-    //     nextTick(() => {
-    //       treeRef.value.scrollToNode(data[0].id)
-    //       // 播放视频
-
-    //     })
-    //   }
-    // })
   }
   const fetch = async () => {
     try {
@@ -135,6 +137,7 @@
     }
   }
   indexDB.getAll().then(allData => {
+    loadingTree.value = true
     if (allData.filter((item: any) => item.name === 'all-dept-list').length) {
       const list = JSON.parse(allData.filter((item: any) => item.name === 'all-dept-list')[0].data).filter((item: any) => item.id !== '0')
       if (allData.filter((item: any) => item.name === 'all-video-list').length) {
@@ -148,6 +151,7 @@
     }
     else {
       fetch()
+      loadingTree.value = false
     }
   })
 
@@ -173,16 +177,17 @@
   window.addEventListener('resize', () => { })
 })
 // 获取echarts数据
-const fetchEchartsData = (obj: any) => {
+function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).reverse().map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).reverse().map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
+    resizePage()
     if (!timer.value && xAxisData.value.length) {
       if (timer.value) {
         clearInterval(timer.value)
@@ -190,12 +195,21 @@
       }
       timer.value = setInterval(() => {
         fetchEchartsData({ ...obj, begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs().format('YYYY-MM-DD HH:mm:ss') })
-      }, 1000 * 60 *20);
+      }, 1000 * 60 * 20);
     }
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
   })
 }
 const currentConcentration = computed(() => {
-  return data.value[0]?.data.length ? data.value[0]?.data.CONCENTRATION : ''
+  if (data.value[0]?.data.length) {
+    const length = data.value[0]?.data.length
+    return data.value[0]?.data[length - 1]
+  }
+  else {
+    return ''
+  }
 })
 // 视频播放失败
 const playerError = (info: string) => {
@@ -203,13 +217,6 @@
 }
 const iWidth = ref(window.innerWidth - 180)
 const iHeight = ref(window.innerHeight * 0.55)
-// console.log(iWidth, iHeight)
-const resizePage = () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 200)
-}
 const complete = () => {
   resizePage()
 }
@@ -227,7 +234,7 @@
       <!-- 左侧组织机构 -->
       <div class="left-container">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always">
+          <el-card v-loading="loadingTree" class="box-card" shadow="always">
             <template #header>
               <div class="clearfix">
                 <!-- <div>监控点列表</div> -->
@@ -261,7 +268,7 @@
                 <span>当前浓度：{{ currentConcentration }}PPM.M</span>
                 <!-- <span style="margin-left: 50px;">报警阈值：50%LEL</span> -->
               </div>
-              <div class="chart">
+              <div class="chart" v-loading="loading">
                 <line-chart v-show="xAxisData.length" :x-axis-data="xAxisData" :data="data" :gradient="false"
                   :smooth="false" unit="%LEL"
                   :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }" />
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index ef2bd48..b6f59b3 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -221,6 +221,7 @@
 const changeVideo = (item: any) => {
   currentVideo.value = item.name
   // 切换云台播放
+  unref(playRef).playerFun.stopAllPlay()
   videoType.value = 'real'
   playerVideo(item.devcode)
 }
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index 17bb85d..e72282f 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -7,12 +7,14 @@
 import dayjs from 'dayjs'
 import { getDeviceGasData } from '@/api/home/station/station'
 import { getAlarmThresholdByCode } from '@/api/home/device/device'
+import { ElMessage } from 'element-plus'
 const $props = defineProps({
   devcode: {
     type: String,
     required: true,
   }
 })
+const emits = defineEmits(['playback'])
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(false)
@@ -67,18 +69,8 @@
   }).then(res => {
     // console.log(res.data, '123123')
     list.value = (res.data || []).reverse()
-    // list.value = [
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '11100.00',
-    //   },
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '1110.00',
-    //   },
-    // ]
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME)
+      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -106,7 +98,7 @@
       data.value = [
         {
           name: '浓度',
-          data: list.value.map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -162,10 +154,6 @@
     resizePage()
   }
 }
-// 查看
-const detail = (row: any) => {
-
-}
 
 watch(() => $props.devcode, (newVal) => {
   if (newVal) {
@@ -222,10 +210,23 @@
     else {
       setTimeout(() => {
         fetchData(true)
-      }, 1000 * 60 *5)
+      }, 1000 * 60 * 5)
     }
   }
 }
+
+// 回放
+const playback = (row: any) => {
+  if (!row.LOGTIME) {
+    ElMessage.warning('该数据无时间')
+    return
+  }
+  const obj = {
+    start: dayjs(row.LOGTIME).subtract(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+    end: dayjs(row.LOGTIME).add(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+  }
+  emits('playback', obj)
+}
 </script>
 
 <template>
@@ -256,7 +257,7 @@
       <template #columns>
         <el-table-column label="操作" align="center" width="70">
           <template #default="scope">
-            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="detail(scope.row)">
+            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="playback(scope.row)">
               回放
             </el-button>
           </template>
@@ -264,7 +265,8 @@
       </template>
     </normal-table>
     <div v-show="!isShowTable" style="width: 100%;height: 370px;">
-      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
+      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false"
+        :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
         :grid="{
           top: 50,
@@ -273,7 +275,7 @@
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
-        <el-empty v-show="!list.length" description="暂无数据" />
+      <el-empty v-show="!list.length" description="暂无数据" />
     </div>
   </table-container>
 </template>
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 29cddac..9e3bb92 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -129,6 +129,25 @@
     })
   }
 }
+// 燃气列表报警回放
+const playback = (obj: any) => {
+  unref(playRef).playerFun.stopAllPlay()
+  videoType.value = 'playback'
+  getVideoBackUrl({
+      deviceId: currentDeviceId.value,
+      beginDate: obj.start,
+      endDate: obj.end
+    }).then(res => {
+      if (!res.data) {
+        ElMessage.warning('回放地址为空')
+        return
+      }
+      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(obj.start).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(obj.end).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+    }).catch(() => {
+      ElMessage.warning('获取回放地址失败')
+    })
+}
 onMounted(() => {
   resizePage()
 })
@@ -163,7 +182,7 @@
     </div>
     <!-- 浓度数据展示区域 -->
     <div class="right-gas">
-      <monitor-data-gas-list :devcode="devcode"  />
+      <monitor-data-gas-list :devcode="devcode" @playback="playback"  />
     </div>
   </div>
 </template>

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 821c3f0..5e0020a 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -11,6 +11,7 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -18,6 +19,7 @@
 const list = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 const chartData = ref<any[]>([])
+const manufactureName = ref('')
 //  列表展示列
 const columns = ref<any>([])
 // 燃气智能监测终端
@@ -44,9 +46,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -56,8 +58,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -164,7 +166,7 @@
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
-      // chartData.value = []
+
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
           if ((res1.data || []).length) {
@@ -267,6 +269,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
@@ -287,11 +306,12 @@
     // 获取设备信息
     getDeviceListPage({ offset: 1, limit: 1, devCode: $route.query.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        // const manufactureName = res.data.rows[0].manufactureName
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -352,7 +372,8 @@
         <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
-        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+          @click="exportList">
           导出
         </el-button>
       </div>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index df8dec7..ae1ee20 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -232,6 +232,9 @@
     else {
       alarmEventList.value = []
     }
+    if (!isFisrst.value) {
+      dataForm.value.alarmThreshold = ''
+    }
   }
 }, {
   deep: true,
@@ -239,7 +242,7 @@
 })
 const currentProduct = ref<any>({})
 watch(() => dataForm.value.productId, (newVal) => {
-  if(newVal) {
+  if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
     console.log(currentProduct.value, 'currentProduct.value')
   }
@@ -258,6 +261,13 @@
   deep: true,
   immediate: true,
 })
+// watch(() => dataForm.value.alarmThreshold, (newVal) => {
+//   if (newVal) {
+//     if (!isFisrst.value) {
+//       dataForm.value.alarmThreshold = ''
+//     }
+//   }
+// })
 </script>
 
 <template>
@@ -318,8 +328,9 @@
         <!-- 系统 -->
         <el-col v-if="dataForm.alarmJudgeMethod === '1'" :span="12">
           <el-form-item label="报警阈值" prop="alarmThreshold">
-            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number" style="width: 50%;" />
-            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL'}}
+            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number"
+              style="width: 50%;" />
+            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL' }}
           </el-form-item>
         </el-col>
         <!-- 设备 -->
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 2ce1653..5196d54 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -60,18 +60,31 @@
     ElMessage.warning('获取设备ID失败')
   })
 }
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const loading = ref(false)
 // 点击树形结构
 const handleNodeClick = (data: any, node: any) => {
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
-    console.log(data, '点击')
+    // console.log(data, '点击')
     const deviceCode = data.DEVICECODE
+    // const deviceCode = 'WXD7507'
     if (deviceCode) {
+      loading.value = true
       clearInterval(timer.value)
       timer.value = null
       playerVideo(deviceCode)
       // 更新echarts
-
+      fetchEchartsData({
+        devCode: deviceCode,
+        begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
     }
     else {
       ElMessage.warning('缺少设备编号')
@@ -89,17 +102,19 @@
 const fetchTreeData = () => {
   loadingTree.value = true
   const setData = (data1: any[], data2: any[]) => {
-    const data = data2.filter((item: any) => item.DEPTID).map((item: any) => ({
+    const data = data2.filter((item: any) => item.DEPTID).map((item: any, index: number) => ({
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}-${index}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}-${index}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
       pid: item.DEPTID,
       value: '',
     }))
+    console.log(data)
     const all = [...data1, ...data]
     expandedKeys.value = []
     all.forEach(element => {
@@ -108,19 +123,6 @@
       }
     })
     treeData.value = toTreeList(all, '0', true)
-    // 设置默认选中
-    // setTimeout(() => {
-    //   if(data.length) {
-    //     console.log(data[0], 'data[0]')
-    //     console.log(data[1], 'data[0]')
-    //     treeRef.value.setCurrentKey(data[0].id)
-    //     nextTick(() => {
-    //       treeRef.value.scrollToNode(data[0].id)
-    //       // 播放视频
-
-    //     })
-    //   }
-    // })
   }
   const fetch = async () => {
     try {
@@ -135,6 +137,7 @@
     }
   }
   indexDB.getAll().then(allData => {
+    loadingTree.value = true
     if (allData.filter((item: any) => item.name === 'all-dept-list').length) {
       const list = JSON.parse(allData.filter((item: any) => item.name === 'all-dept-list')[0].data).filter((item: any) => item.id !== '0')
       if (allData.filter((item: any) => item.name === 'all-video-list').length) {
@@ -148,6 +151,7 @@
     }
     else {
       fetch()
+      loadingTree.value = false
     }
   })
 
@@ -173,16 +177,17 @@
   window.addEventListener('resize', () => { })
 })
 // 获取echarts数据
-const fetchEchartsData = (obj: any) => {
+function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).reverse().map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).reverse().map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
+    resizePage()
     if (!timer.value && xAxisData.value.length) {
       if (timer.value) {
         clearInterval(timer.value)
@@ -190,12 +195,21 @@
       }
       timer.value = setInterval(() => {
         fetchEchartsData({ ...obj, begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs().format('YYYY-MM-DD HH:mm:ss') })
-      }, 1000 * 60 *20);
+      }, 1000 * 60 * 20);
     }
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
   })
 }
 const currentConcentration = computed(() => {
-  return data.value[0]?.data.length ? data.value[0]?.data.CONCENTRATION : ''
+  if (data.value[0]?.data.length) {
+    const length = data.value[0]?.data.length
+    return data.value[0]?.data[length - 1]
+  }
+  else {
+    return ''
+  }
 })
 // 视频播放失败
 const playerError = (info: string) => {
@@ -203,13 +217,6 @@
 }
 const iWidth = ref(window.innerWidth - 180)
 const iHeight = ref(window.innerHeight * 0.55)
-// console.log(iWidth, iHeight)
-const resizePage = () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 200)
-}
 const complete = () => {
   resizePage()
 }
@@ -227,7 +234,7 @@
       <!-- 左侧组织机构 -->
       <div class="left-container">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always">
+          <el-card v-loading="loadingTree" class="box-card" shadow="always">
             <template #header>
               <div class="clearfix">
                 <!-- <div>监控点列表</div> -->
@@ -261,7 +268,7 @@
                 <span>当前浓度：{{ currentConcentration }}PPM.M</span>
                 <!-- <span style="margin-left: 50px;">报警阈值：50%LEL</span> -->
               </div>
-              <div class="chart">
+              <div class="chart" v-loading="loading">
                 <line-chart v-show="xAxisData.length" :x-axis-data="xAxisData" :data="data" :gradient="false"
                   :smooth="false" unit="%LEL"
                   :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }" />
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index ef2bd48..b6f59b3 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -221,6 +221,7 @@
 const changeVideo = (item: any) => {
   currentVideo.value = item.name
   // 切换云台播放
+  unref(playRef).playerFun.stopAllPlay()
   videoType.value = 'real'
   playerVideo(item.devcode)
 }
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index 17bb85d..e72282f 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -7,12 +7,14 @@
 import dayjs from 'dayjs'
 import { getDeviceGasData } from '@/api/home/station/station'
 import { getAlarmThresholdByCode } from '@/api/home/device/device'
+import { ElMessage } from 'element-plus'
 const $props = defineProps({
   devcode: {
     type: String,
     required: true,
   }
 })
+const emits = defineEmits(['playback'])
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(false)
@@ -67,18 +69,8 @@
   }).then(res => {
     // console.log(res.data, '123123')
     list.value = (res.data || []).reverse()
-    // list.value = [
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '11100.00',
-    //   },
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '1110.00',
-    //   },
-    // ]
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME)
+      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -106,7 +98,7 @@
       data.value = [
         {
           name: '浓度',
-          data: list.value.map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -162,10 +154,6 @@
     resizePage()
   }
 }
-// 查看
-const detail = (row: any) => {
-
-}
 
 watch(() => $props.devcode, (newVal) => {
   if (newVal) {
@@ -222,10 +210,23 @@
     else {
       setTimeout(() => {
         fetchData(true)
-      }, 1000 * 60 *5)
+      }, 1000 * 60 * 5)
     }
   }
 }
+
+// 回放
+const playback = (row: any) => {
+  if (!row.LOGTIME) {
+    ElMessage.warning('该数据无时间')
+    return
+  }
+  const obj = {
+    start: dayjs(row.LOGTIME).subtract(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+    end: dayjs(row.LOGTIME).add(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+  }
+  emits('playback', obj)
+}
 </script>
 
 <template>
@@ -256,7 +257,7 @@
       <template #columns>
         <el-table-column label="操作" align="center" width="70">
           <template #default="scope">
-            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="detail(scope.row)">
+            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="playback(scope.row)">
               回放
             </el-button>
           </template>
@@ -264,7 +265,8 @@
       </template>
     </normal-table>
     <div v-show="!isShowTable" style="width: 100%;height: 370px;">
-      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
+      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false"
+        :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
         :grid="{
           top: 50,
@@ -273,7 +275,7 @@
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
-        <el-empty v-show="!list.length" description="暂无数据" />
+      <el-empty v-show="!list.length" description="暂无数据" />
     </div>
   </table-container>
 </template>
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 29cddac..9e3bb92 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -129,6 +129,25 @@
     })
   }
 }
+// 燃气列表报警回放
+const playback = (obj: any) => {
+  unref(playRef).playerFun.stopAllPlay()
+  videoType.value = 'playback'
+  getVideoBackUrl({
+      deviceId: currentDeviceId.value,
+      beginDate: obj.start,
+      endDate: obj.end
+    }).then(res => {
+      if (!res.data) {
+        ElMessage.warning('回放地址为空')
+        return
+      }
+      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(obj.start).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(obj.end).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+    }).catch(() => {
+      ElMessage.warning('获取回放地址失败')
+    })
+}
 onMounted(() => {
   resizePage()
 })
@@ -163,7 +182,7 @@
     </div>
     <!-- 浓度数据展示区域 -->
     <div class="right-gas">
-      <monitor-data-gas-list :devcode="devcode"  />
+      <monitor-data-gas-list :devcode="devcode" @playback="playback"  />
     </div>
   </div>
 </template>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 96808e4..7cbc1e1 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -35,7 +35,6 @@
       ElMessage('设备ID为空，无法获取视频')
       return
     }
-    // currentDeviceId.value = deviceId
     getVideoUrl({
       deviceId: deviceId,
       streamType: '0'
@@ -47,11 +46,8 @@
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
   }).catch(() => {
-    // currentDeviceId.value = ''
     ElMessage.warning('获取设备ID失败')
   })
 }
@@ -60,24 +56,39 @@
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
-const handleNodeClick = (data: any) => {
-  // && data.DEVICECODE
-  if (data.id.includes('station') ) {
+const handleNodeClick = (data: any, status: boolean) => {
+  if(!data.DEVCODE && status) {
+    ElMessage.warning('设备编号为空')
+    treeRef.value.setChecked(data.id, false)
+    return
+  }
+  if (data.id.includes('station') && status) {
     // 点击的设备(加载视频)
-    console.log('station', data)
+    // console.log('station', data)
+    // data.DEVCODE = 'WXD7507'
     // 添加到视频数组
-    // if(videoList.value.filter((item:any) => item.DEVICECODE === data.DEVICECODE).length) {
-    // }
-    // else {
-      if(videoList.value.filter((item) => item.id).length === 4) {
-        treeRef.value.setChecked(videoList.value[3].id, false)
-      }
-      videoList.value.unshift(data)
-      // 播放
-      playerVideo(data.DEVICECODE, playRef1)
+    if (videoList.value.filter((item) => item.id).length === 4) {
+      treeRef.value.setChecked(videoList.value[3].id, false)
+    }
+    videoList.value.unshift(data)
+    // 播放当前
+    playerVideo(data.DEVCODE, playRef1.value)
+    videoList.value.pop()
+    videoList.value.forEach((item,index) => {
+       if(item.id && index!== 0) {
+        const dict = {
+          1: playRef2.value,
+          2: playRef3.value,
+          3: playRef4.value
+        }
+        playerVideo(item.DEVCODE, dict[index])
+       }
+    })
 
-      videoList.value.pop()
-    // }
+  }
+  else if (data.id.includes('station') && !status) {
+    videoList.value = videoList.value.filter((item) => item.id !== data.id)
+    videoList.value.push({})
   }
 }
 // 查询组织机构
@@ -95,7 +106,8 @@
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
@@ -187,7 +199,7 @@
                 :expand-on-click-node="false" @node-click="handleNodeClick" /> -->
               <el-tree-v2 v-if="treeData.length" ref="treeRef" :data="treeData" :props="defaultProps"
                 :height="treeHeight" :check-on-click-node="true" :default-expanded-keys="expandedKeys"
-                @node-click="handleNodeClick" :filter-method="filterTree" empty-text="暂无组织数据" show-checkbox
+                @check-change="handleNodeClick" :filter-method="filterTree" empty-text="暂无组织数据" show-checkbox
                 :highlight-current="true" />
 
             </el-scrollbar>
@@ -201,10 +213,26 @@
             <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
               controls autoplay /> -->
             <!-- videoList -->
-            <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[0]?.name }}</span>
+              <player :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
+            </div>
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[1]?.name }}</span>
+              <player :playId="`video-player-${1}`" ref="playRef2" @error="playerError" />
+            </div>
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[2]?.name }}</span>
+              <player :playId="`video-player-${2}`" ref="playRef3" @error="playerError" />
+            </div>
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[3]?.name }}</span>
+              <player :playId="`video-player-${3}`" ref="playRef4" @error="playerError" />
+            </div>
+            <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
               <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div>
+            </div> -->
           </div>
         </el-card>
       </div>
@@ -240,9 +268,12 @@
   width: 49%;
   height: 40vh;
   position: relative;
+
   .title {
     position: absolute;
-    top:5px;
+    top: 5px;
+    right: 5px;
+    text-align: right;
     color: #fff;
     z-index: 9;
     left: 10px;

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 821c3f0..5e0020a 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -11,6 +11,7 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -18,6 +19,7 @@
 const list = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 const chartData = ref<any[]>([])
+const manufactureName = ref('')
 //  列表展示列
 const columns = ref<any>([])
 // 燃气智能监测终端
@@ -44,9 +46,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -56,8 +58,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -164,7 +166,7 @@
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
-      // chartData.value = []
+
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
           if ((res1.data || []).length) {
@@ -267,6 +269,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
@@ -287,11 +306,12 @@
     // 获取设备信息
     getDeviceListPage({ offset: 1, limit: 1, devCode: $route.query.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        // const manufactureName = res.data.rows[0].manufactureName
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -352,7 +372,8 @@
         <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
-        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+          @click="exportList">
           导出
         </el-button>
       </div>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index df8dec7..ae1ee20 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -232,6 +232,9 @@
     else {
       alarmEventList.value = []
     }
+    if (!isFisrst.value) {
+      dataForm.value.alarmThreshold = ''
+    }
   }
 }, {
   deep: true,
@@ -239,7 +242,7 @@
 })
 const currentProduct = ref<any>({})
 watch(() => dataForm.value.productId, (newVal) => {
-  if(newVal) {
+  if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
     console.log(currentProduct.value, 'currentProduct.value')
   }
@@ -258,6 +261,13 @@
   deep: true,
   immediate: true,
 })
+// watch(() => dataForm.value.alarmThreshold, (newVal) => {
+//   if (newVal) {
+//     if (!isFisrst.value) {
+//       dataForm.value.alarmThreshold = ''
+//     }
+//   }
+// })
 </script>
 
 <template>
@@ -318,8 +328,9 @@
         <!-- 系统 -->
         <el-col v-if="dataForm.alarmJudgeMethod === '1'" :span="12">
           <el-form-item label="报警阈值" prop="alarmThreshold">
-            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number" style="width: 50%;" />
-            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL'}}
+            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number"
+              style="width: 50%;" />
+            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL' }}
           </el-form-item>
         </el-col>
         <!-- 设备 -->
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 2ce1653..5196d54 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -60,18 +60,31 @@
     ElMessage.warning('获取设备ID失败')
   })
 }
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const loading = ref(false)
 // 点击树形结构
 const handleNodeClick = (data: any, node: any) => {
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
-    console.log(data, '点击')
+    // console.log(data, '点击')
     const deviceCode = data.DEVICECODE
+    // const deviceCode = 'WXD7507'
     if (deviceCode) {
+      loading.value = true
       clearInterval(timer.value)
       timer.value = null
       playerVideo(deviceCode)
       // 更新echarts
-
+      fetchEchartsData({
+        devCode: deviceCode,
+        begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
     }
     else {
       ElMessage.warning('缺少设备编号')
@@ -89,17 +102,19 @@
 const fetchTreeData = () => {
   loadingTree.value = true
   const setData = (data1: any[], data2: any[]) => {
-    const data = data2.filter((item: any) => item.DEPTID).map((item: any) => ({
+    const data = data2.filter((item: any) => item.DEPTID).map((item: any, index: number) => ({
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}-${index}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}-${index}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
       pid: item.DEPTID,
       value: '',
     }))
+    console.log(data)
     const all = [...data1, ...data]
     expandedKeys.value = []
     all.forEach(element => {
@@ -108,19 +123,6 @@
       }
     })
     treeData.value = toTreeList(all, '0', true)
-    // 设置默认选中
-    // setTimeout(() => {
-    //   if(data.length) {
-    //     console.log(data[0], 'data[0]')
-    //     console.log(data[1], 'data[0]')
-    //     treeRef.value.setCurrentKey(data[0].id)
-    //     nextTick(() => {
-    //       treeRef.value.scrollToNode(data[0].id)
-    //       // 播放视频
-
-    //     })
-    //   }
-    // })
   }
   const fetch = async () => {
     try {
@@ -135,6 +137,7 @@
     }
   }
   indexDB.getAll().then(allData => {
+    loadingTree.value = true
     if (allData.filter((item: any) => item.name === 'all-dept-list').length) {
       const list = JSON.parse(allData.filter((item: any) => item.name === 'all-dept-list')[0].data).filter((item: any) => item.id !== '0')
       if (allData.filter((item: any) => item.name === 'all-video-list').length) {
@@ -148,6 +151,7 @@
     }
     else {
       fetch()
+      loadingTree.value = false
     }
   })
 
@@ -173,16 +177,17 @@
   window.addEventListener('resize', () => { })
 })
 // 获取echarts数据
-const fetchEchartsData = (obj: any) => {
+function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).reverse().map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).reverse().map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
+    resizePage()
     if (!timer.value && xAxisData.value.length) {
       if (timer.value) {
         clearInterval(timer.value)
@@ -190,12 +195,21 @@
       }
       timer.value = setInterval(() => {
         fetchEchartsData({ ...obj, begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs().format('YYYY-MM-DD HH:mm:ss') })
-      }, 1000 * 60 *20);
+      }, 1000 * 60 * 20);
     }
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
   })
 }
 const currentConcentration = computed(() => {
-  return data.value[0]?.data.length ? data.value[0]?.data.CONCENTRATION : ''
+  if (data.value[0]?.data.length) {
+    const length = data.value[0]?.data.length
+    return data.value[0]?.data[length - 1]
+  }
+  else {
+    return ''
+  }
 })
 // 视频播放失败
 const playerError = (info: string) => {
@@ -203,13 +217,6 @@
 }
 const iWidth = ref(window.innerWidth - 180)
 const iHeight = ref(window.innerHeight * 0.55)
-// console.log(iWidth, iHeight)
-const resizePage = () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 200)
-}
 const complete = () => {
   resizePage()
 }
@@ -227,7 +234,7 @@
       <!-- 左侧组织机构 -->
       <div class="left-container">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always">
+          <el-card v-loading="loadingTree" class="box-card" shadow="always">
             <template #header>
               <div class="clearfix">
                 <!-- <div>监控点列表</div> -->
@@ -261,7 +268,7 @@
                 <span>当前浓度：{{ currentConcentration }}PPM.M</span>
                 <!-- <span style="margin-left: 50px;">报警阈值：50%LEL</span> -->
               </div>
-              <div class="chart">
+              <div class="chart" v-loading="loading">
                 <line-chart v-show="xAxisData.length" :x-axis-data="xAxisData" :data="data" :gradient="false"
                   :smooth="false" unit="%LEL"
                   :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }" />
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index ef2bd48..b6f59b3 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -221,6 +221,7 @@
 const changeVideo = (item: any) => {
   currentVideo.value = item.name
   // 切换云台播放
+  unref(playRef).playerFun.stopAllPlay()
   videoType.value = 'real'
   playerVideo(item.devcode)
 }
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index 17bb85d..e72282f 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -7,12 +7,14 @@
 import dayjs from 'dayjs'
 import { getDeviceGasData } from '@/api/home/station/station'
 import { getAlarmThresholdByCode } from '@/api/home/device/device'
+import { ElMessage } from 'element-plus'
 const $props = defineProps({
   devcode: {
     type: String,
     required: true,
   }
 })
+const emits = defineEmits(['playback'])
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(false)
@@ -67,18 +69,8 @@
   }).then(res => {
     // console.log(res.data, '123123')
     list.value = (res.data || []).reverse()
-    // list.value = [
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '11100.00',
-    //   },
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '1110.00',
-    //   },
-    // ]
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME)
+      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -106,7 +98,7 @@
       data.value = [
         {
           name: '浓度',
-          data: list.value.map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -162,10 +154,6 @@
     resizePage()
   }
 }
-// 查看
-const detail = (row: any) => {
-
-}
 
 watch(() => $props.devcode, (newVal) => {
   if (newVal) {
@@ -222,10 +210,23 @@
     else {
       setTimeout(() => {
         fetchData(true)
-      }, 1000 * 60 *5)
+      }, 1000 * 60 * 5)
     }
   }
 }
+
+// 回放
+const playback = (row: any) => {
+  if (!row.LOGTIME) {
+    ElMessage.warning('该数据无时间')
+    return
+  }
+  const obj = {
+    start: dayjs(row.LOGTIME).subtract(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+    end: dayjs(row.LOGTIME).add(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+  }
+  emits('playback', obj)
+}
 </script>
 
 <template>
@@ -256,7 +257,7 @@
       <template #columns>
         <el-table-column label="操作" align="center" width="70">
           <template #default="scope">
-            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="detail(scope.row)">
+            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="playback(scope.row)">
               回放
             </el-button>
           </template>
@@ -264,7 +265,8 @@
       </template>
     </normal-table>
     <div v-show="!isShowTable" style="width: 100%;height: 370px;">
-      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
+      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false"
+        :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
         :grid="{
           top: 50,
@@ -273,7 +275,7 @@
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
-        <el-empty v-show="!list.length" description="暂无数据" />
+      <el-empty v-show="!list.length" description="暂无数据" />
     </div>
   </table-container>
 </template>
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 29cddac..9e3bb92 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -129,6 +129,25 @@
     })
   }
 }
+// 燃气列表报警回放
+const playback = (obj: any) => {
+  unref(playRef).playerFun.stopAllPlay()
+  videoType.value = 'playback'
+  getVideoBackUrl({
+      deviceId: currentDeviceId.value,
+      beginDate: obj.start,
+      endDate: obj.end
+    }).then(res => {
+      if (!res.data) {
+        ElMessage.warning('回放地址为空')
+        return
+      }
+      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(obj.start).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(obj.end).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+    }).catch(() => {
+      ElMessage.warning('获取回放地址失败')
+    })
+}
 onMounted(() => {
   resizePage()
 })
@@ -163,7 +182,7 @@
     </div>
     <!-- 浓度数据展示区域 -->
     <div class="right-gas">
-      <monitor-data-gas-list :devcode="devcode"  />
+      <monitor-data-gas-list :devcode="devcode" @playback="playback"  />
     </div>
   </div>
 </template>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 96808e4..7cbc1e1 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -35,7 +35,6 @@
       ElMessage('设备ID为空，无法获取视频')
       return
     }
-    // currentDeviceId.value = deviceId
     getVideoUrl({
       deviceId: deviceId,
       streamType: '0'
@@ -47,11 +46,8 @@
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
   }).catch(() => {
-    // currentDeviceId.value = ''
     ElMessage.warning('获取设备ID失败')
   })
 }
@@ -60,24 +56,39 @@
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
-const handleNodeClick = (data: any) => {
-  // && data.DEVICECODE
-  if (data.id.includes('station') ) {
+const handleNodeClick = (data: any, status: boolean) => {
+  if(!data.DEVCODE && status) {
+    ElMessage.warning('设备编号为空')
+    treeRef.value.setChecked(data.id, false)
+    return
+  }
+  if (data.id.includes('station') && status) {
     // 点击的设备(加载视频)
-    console.log('station', data)
+    // console.log('station', data)
+    // data.DEVCODE = 'WXD7507'
     // 添加到视频数组
-    // if(videoList.value.filter((item:any) => item.DEVICECODE === data.DEVICECODE).length) {
-    // }
-    // else {
-      if(videoList.value.filter((item) => item.id).length === 4) {
-        treeRef.value.setChecked(videoList.value[3].id, false)
-      }
-      videoList.value.unshift(data)
-      // 播放
-      playerVideo(data.DEVICECODE, playRef1)
+    if (videoList.value.filter((item) => item.id).length === 4) {
+      treeRef.value.setChecked(videoList.value[3].id, false)
+    }
+    videoList.value.unshift(data)
+    // 播放当前
+    playerVideo(data.DEVCODE, playRef1.value)
+    videoList.value.pop()
+    videoList.value.forEach((item,index) => {
+       if(item.id && index!== 0) {
+        const dict = {
+          1: playRef2.value,
+          2: playRef3.value,
+          3: playRef4.value
+        }
+        playerVideo(item.DEVCODE, dict[index])
+       }
+    })
 
-      videoList.value.pop()
-    // }
+  }
+  else if (data.id.includes('station') && !status) {
+    videoList.value = videoList.value.filter((item) => item.id !== data.id)
+    videoList.value.push({})
   }
 }
 // 查询组织机构
@@ -95,7 +106,8 @@
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
@@ -187,7 +199,7 @@
                 :expand-on-click-node="false" @node-click="handleNodeClick" /> -->
               <el-tree-v2 v-if="treeData.length" ref="treeRef" :data="treeData" :props="defaultProps"
                 :height="treeHeight" :check-on-click-node="true" :default-expanded-keys="expandedKeys"
-                @node-click="handleNodeClick" :filter-method="filterTree" empty-text="暂无组织数据" show-checkbox
+                @check-change="handleNodeClick" :filter-method="filterTree" empty-text="暂无组织数据" show-checkbox
                 :highlight-current="true" />
 
             </el-scrollbar>
@@ -201,10 +213,26 @@
             <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
               controls autoplay /> -->
             <!-- videoList -->
-            <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[0]?.name }}</span>
+              <player :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
+            </div>
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[1]?.name }}</span>
+              <player :playId="`video-player-${1}`" ref="playRef2" @error="playerError" />
+            </div>
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[2]?.name }}</span>
+              <player :playId="`video-player-${2}`" ref="playRef3" @error="playerError" />
+            </div>
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[3]?.name }}</span>
+              <player :playId="`video-player-${3}`" ref="playRef4" @error="playerError" />
+            </div>
+            <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
               <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div>
+            </div> -->
           </div>
         </el-card>
       </div>
@@ -240,9 +268,12 @@
   width: 49%;
   height: 40vh;
   position: relative;
+
   .title {
     position: absolute;
-    top:5px;
+    top: 5px;
+    right: 5px;
+    text-align: right;
     color: #fff;
     z-index: 9;
     left: 10px;
diff --git a/src/views/home/well/components/monitorData.vue b/src/views/home/well/components/monitorData.vue
index 196b3b8..191615c 100644
--- a/src/views/home/well/components/monitorData.vue
+++ b/src/views/home/well/components/monitorData.vue
@@ -18,7 +18,7 @@
 const NoAllData = ref(false)
 onMounted(() => {
   getMonitorData({ wellId: $route.query.id as string }).then((res) => {
-    if (res.data['燃气智能监测终端'] || res.data['燃气智能监测终端（一体化）']) {
+    if (res.data['燃气智能监测终端'] || res.data['燃气智能监测终端（一体化）'] || res.data['管网哨兵']|| res.data['管网哨兵(一体化)']) {
       showGas.value = true
       activeName.value = '燃气浓度'
     }

diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
index e06e5a9..6c969a7 100644
--- a/src/api/home/device/count.ts
+++ b/src/api/home/device/count.ts
@@ -46,7 +46,7 @@
 // 离线设备清单
 export function getOfflineDevice(data: any) {
   return request({
-    url: '/device/statics/offLineList',
+    url: `/device/statics/offLineList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/home/station/video.ts b/src/api/home/station/video.ts
index de3d52d..3ef12ec 100644
--- a/src/api/home/station/video.ts
+++ b/src/api/home/station/video.ts
@@ -23,10 +23,10 @@
   return request({
     url: `/ptz/getPlayBackUrl`,
     method: 'post',
-    // data,
-    params: {
-      ...data,
-    }
+    data,
+    // params: {
+    //   ...data,
+    // }
   })
 }
 
@@ -35,8 +35,9 @@
   return request({
     url: `/ptz/controCearm`,
     method: 'post',
-    params: {
-      ...data,
-    }
+    data
+    // params: {
+    //   ...data,
+    // }
   })
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index 347a901..96289e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -54,7 +54,6 @@
     NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
     NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
     NormalTable: typeof import('./components/NormalTable/index.vue')['default']
-    offline: typeof import('./components/map/index offline.vue')['default']
     PageHeader: typeof import('./components/PageHeader/index.vue')['default']
     PageMain: typeof import('./components/PageMain/index.vue')['default']
     PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
@@ -75,5 +74,16 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanIcon: typeof import('vant/es')['Icon']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPickerGroup: typeof import('vant/es')['PickerGroup']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
   }
 }
diff --git a/src/components/HKplayer/errorCode.js b/src/components/HKplayer/errorCode.js
index f44b864..17d2a23 100644
--- a/src/components/HKplayer/errorCode.js
+++ b/src/components/HKplayer/errorCode.js
@@ -11,7 +11,7 @@
   '0x12f900011': '设置的音量不在1 - 100范围',
   '0x12f910000': 'websocket连接失败，请检查网络是否通畅，URL是否正确',
   '0x12f910010': '取流失败',
-  '0x12f910011': '流中断，电脑配置过低，程序卡主线程都可能导致流中断',
+  '0x12f910011': '视频中断',
   '0x12f910014': '没有音频数据',
   '0x12f910015': '未找到对应websocket，取流套接字被动关闭的报错',
   '0x12f910016': 'websocket不在连接状态',
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index b204454..bdc6bd2 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -141,6 +141,7 @@
   img.style.top = '0'
   img.style.left = '0'
   img.style.position = "absolute"
+  video.appendChild(img)
   player.value
     .JS_Play(data.url, { playURL: data.url, mode: 0 }, 0, data.startTime, data.endTime)
     .then(
@@ -148,6 +149,7 @@
         console.log('playbackStart success')
         // 播放成功删除图片
         img.remove()
+        ElMessage.warning('播放十秒自动关闭')
       },
       (err) => {
         console.info('JS_Play failed:', errorCode[err] || '播放失败')
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index b25b9cb..03e53c1 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -12,8 +12,10 @@
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false) // 对话框是否显示
 const info = ref()
+const manufactureName = ref('')
 const listQuery = ref({
   devcode: '',
   typeName: '',
@@ -93,9 +95,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -105,8 +107,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -307,6 +309,23 @@
           //     .map(item => item.vbat || '0')
           // }
         ]
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
           {
@@ -362,13 +381,14 @@
     } else if (row.devTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       // 获取设备信息
+      manufactureName.value = ''
       getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
         if (res.data.rows.length) {
-          const manufactureName = res.data.rows[0].manufactureName
-          if (manufactureName.includes('百瑞生')) {
+          manufactureName.value = res.data.rows[0].manufactureName
+          if (manufactureName.value.includes('百瑞生')) {
             columns.value = columns2BRS.value
           }
-          else if (manufactureName.includes('麦哈克')) {
+          else if (manufactureName.value.includes('麦哈克')) {
             columns.value = columns2MHK.value
           }
         }
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5277650..2bef320 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -11,6 +11,7 @@
 import { getDeviceListPage } from '@/api/home/device/device'
 import { exportFile } from '@/utils/exportUtils'
 import { toHumpObject } from '@/utils/String'
+import { handlerListData } from './handlerData'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -45,7 +46,6 @@
   }
 })
 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')]
 const showTable = ref(true)
 const resizePage = () => {
   setTimeout(() => {
@@ -94,9 +94,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -106,8 +106,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: 'ssstate', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -135,6 +135,7 @@
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
+const manufactureName = ref('')
 const setColumn = () => {
   const row = JSON.parse($route.query.row as string)
   const deviceTypeName = row.devTypeName || deviceTypeList.value.filter((item: any) => item.id === row.deviceType || row.deviceTypeId)[0]?.typeName || ''
@@ -147,6 +148,7 @@
     else if (deviceTypeName.includes('管网哨兵')) {
       columns.value = columns2.value
       if (row.manufactureName) {
+        manufactureName.value = row.manufactureName
         if (row.manufactureName.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
@@ -157,11 +159,12 @@
       else {
         getDeviceListPage({ offset: 1, limit: 1, devCode: row.devcode }).then(res => {
           if (res.data.rows.length) {
-            const manufactureName = res.data.rows[0].manufactureName
-            if (manufactureName.includes('百瑞生')) {
+            // const manufactureName = res.data.rows[0].manufactureName
+            manufactureName.value = res.data.rows[0].manufactureName
+            if (manufactureName.value.includes('百瑞生')) {
               columns.value = columns2BRS.value
             }
-            else if (manufactureName.includes('麦哈克')) {
+            else if (manufactureName.value.includes('麦哈克')) {
               columns.value = columns2MHK.value
             }
           }
@@ -322,6 +325,23 @@
           }
         },
       ]
+      // 处理列表字段
+      // 根据厂家判断
+      if (manufactureName.value) {
+        handlerListData(manufactureName.value, list.value, (data: any) => {
+          list.value = data
+        })
+      }
+      else {
+        getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+          if (res.data.rows.length) {
+            manufactureName.value = res.data.rows[0].manufactureName
+            handlerListData(manufactureName.value, list.value, (data: any) => {
+              list.value = data
+            })
+          }
+        })
+      }
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
diff --git a/src/views/home/device/device/components/handlerData.ts b/src/views/home/device/device/components/handlerData.ts
new file mode 100644
index 0000000..e09c666
--- /dev/null
+++ b/src/views/home/device/device/components/handlerData.ts
@@ -0,0 +1,65 @@
+// 处理百瑞生和麦哈克数据
+export const handlerListData = (manufactureName: string, list: any[], fun: Function) => {
+  //  百瑞生
+  if (manufactureName.includes('百瑞生')) {
+    // console.log(list.value, '百瑞生')
+    const ssStateDict = {
+      0: '正常',
+      1: '通讯异常'
+    } as { [key: string]: string }
+    const sigDict = {
+      1: '信号弱',
+      2: '信号中等',
+      3: '信号强'
+    } as { [key: string]: string }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //传感器状态
+      sig: sigDict[item.sig] ? sigDict[item.sig] : '', // 信号强度
+      temp: item.temp ? Number(item.temp) / 100 : '' // 温度 扩大100倍传输
+    }))
+    fun(list)
+  }
+  // 麦哈克
+  else if (manufactureName.includes('麦哈克')) {
+    const ssStateDict = {
+      0: '正常',
+      1: '低电告警',
+      2: '关机'
+    } as { [key: string]: string }
+    const rsrpDict = (rsrp: number) => {
+      let result = ''
+      if (rsrp > -60 && rsrp <= -40) {
+        result = '非常好'
+      }
+      else if (rsrp > -70 && rsrp <= -60) {
+        result = '良好'
+      }
+      else if (rsrp > -80 && rsrp <= -70) {
+        result = '一般'
+      }
+      else if (rsrp > -90 && rsrp <= -80) {
+        result = '稍弱'
+      }
+      else if (rsrp > -100 && rsrp <= -90) {
+        result = '较弱'
+      }
+      else if (rsrp > -110 && rsrp <= -100) {
+        result = '差'
+      }
+      else if (rsrp < -110) {
+        result = '很差'
+      }
+      else if (rsrp > -40) {
+        result = '非常好'
+      }
+      return result
+    }
+    list = list.map((item: any) => ({
+      ...item,
+      ssState: ssStateDict[item.ssState] ? ssStateDict[item.ssState] : '', //电池状态
+      rsrp: item.rsrp ? rsrpDict(Number(item.rsrp)) : '', // 接收信号参考质量
+    }))
+    fun(list)
+  }
+}
diff --git a/src/views/home/operation/trajectory/detail.vue b/src/views/home/operation/trajectory/detail.vue
index eb20d81..aa2bb3a 100644
--- a/src/views/home/operation/trajectory/detail.vue
+++ b/src/views/home/operation/trajectory/detail.vue
@@ -44,6 +44,26 @@
   }).then((res) => {
     console.log(res.data)
     loading.value = false
+    if (res.data.length === 1) {
+      if (res.data[0].LONGITUDE_LATITUDE) {
+        mapRef.value.addMarker({
+          position: (row.startPosition || '').split(','),
+          // position: [116.307719, 39.979882],
+          // content: '<div class="icon-marker-dir icon-start"></div>',
+          label: '',
+          data: res.data[0] || {},
+          // type: 'start',
+          // offsetX: -14,
+          // offsetY: -14,
+        })
+        mapRef.value.map.setFitView()
+      }
+      else {
+        mapRef.value.removeMarker()
+        ElMessage.warning('轨迹信息无效')
+      }
+      return
+    }
     if (res.data.length >= 2) {
       res.data.unshift({
         ...res.data[0],
@@ -145,15 +165,14 @@
   <el-dialog v-model="dialogFormVisible" title="轨迹查看" append-to-body>
     <search-area @search="fetchData(info)">
       <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
+        <el-date-picker v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
-          clearable
-        />
+          clearable />
       </search-item>
     </search-area>
     <div v-loading="loading" style="width: 100%;height: 300px;">
-      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap" @markerClick="markerClick" />
+      <a-map v-if="dialogFormVisible" ref="mapRef" :show-pieple-layer="true" :zoom="14" @complete="completeMap"
+        @markerClick="markerClick" />
     </div>
     <template #footer>
       <div class="dialog-footer">
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index e392f59..2b22a80 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -7,9 +7,11 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const dialogFormVisible = ref(false)
 // 是否展示表格
 const isShowTable = ref(true)
+const manufactureName = ref('')
 // 初始化对话框
 const initDialog = (row: any) => {
   isShowTable.value = true
@@ -18,13 +20,14 @@
   } else if (row.deviceTypeName.includes('管网哨兵')) {
     columns.value = columns2.value
     // 获取设备信息
+    manufactureName.value = ''
     getDeviceListPage({ offset: 1, limit: 1, devCode: row.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -83,9 +86,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -95,8 +98,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -205,7 +208,7 @@
   // 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) => toHumpObject(item))
+    list.value = res.data.map((item: any) => toHumpObject(item)).reverse()
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
@@ -312,6 +315,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 821c3f0..5e0020a 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -11,6 +11,7 @@
 import { getDataSearch, getAlarmThresholdByCode } from '@/api/home/device/device'
 import { toHumpObject } from '@/utils/String'
 import { exportExcel } from '@/utils/exportXlsx'
+import { handlerListData } from '@/views/home/device/device/components/handlerData'
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(true)
@@ -18,6 +19,7 @@
 const list = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 const chartData = ref<any[]>([])
+const manufactureName = ref('')
 //  列表展示列
 const columns = ref<any>([])
 // 燃气智能监测终端
@@ -44,9 +46,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '传感器状态', value: '', align: 'center' },
-  { text: '温度(℃)', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '传感器状态', value: 'ssState', align: 'center' },
+  { text: '温度(℃)', value: 'temp', align: 'center' },
+  { text: '信号质量', value: 'sig', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -56,8 +58,8 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '燃气浓度（%LEL)', value: 'gasval', align: 'center', isCustom: true },
   { text: '电池电压(mV)', value: 'vbat', align: 'center' },
-  { text: '电池状态', value: '', align: 'center' },
-  { text: '信号质量', value: '', align: 'center' },
+  { text: '电池状态', value: 'ssState', align: 'center' },
+  { text: '信号质量', value: 'rsrp', align: 'center' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
   { text: '设备状态', value: 'status', align: 'center', width: 90, isCustom: true },
@@ -164,7 +166,7 @@
     if (listQuery.value.typeName.includes('管网哨兵')) {
       xAxisData.value = list.value.slice().map(item => item.logtime)
       let markLineData = [] as any[]
-      // chartData.value = []
+
       if (list.value.length) {
         getAlarmThresholdByCode({ devCode: list.value[0].devcode }).then(res1 => {
           if ((res1.data || []).length) {
@@ -267,6 +269,23 @@
           })
           loadingTable.value = false
         })
+        // 处理列表字段
+        // 根据厂家判断
+        if (manufactureName.value) {
+          handlerListData(manufactureName.value, list.value, (data: any) => {
+            list.value = data
+          })
+        }
+        else {
+          getDeviceListPage({ offset: 1, limit: 1, devCode: listQuery.value.devcode }).then(res => {
+            if (res.data.rows.length) {
+              manufactureName.value = res.data.rows[0].manufactureName
+              handlerListData(manufactureName.value, list.value, (data: any) => {
+                list.value = data
+              })
+            }
+          })
+        }
       }
       else {
         loadingTable.value = false
@@ -287,11 +306,12 @@
     // 获取设备信息
     getDeviceListPage({ offset: 1, limit: 1, devCode: $route.query.deviceCode }).then(res => {
       if (res.data.rows.length) {
-        const manufactureName = res.data.rows[0].manufactureName
-        if (manufactureName.includes('百瑞生')) {
+        // const manufactureName = res.data.rows[0].manufactureName
+        manufactureName.value = res.data.rows[0].manufactureName
+        if (manufactureName.value.includes('百瑞生')) {
           columns.value = columns2BRS.value
         }
-        else if (manufactureName.includes('麦哈克')) {
+        else if (manufactureName.value.includes('麦哈克')) {
           columns.value = columns2MHK.value
         }
       }
@@ -352,7 +372,8 @@
         <el-button v-if="listQuery.typeName.includes('管网哨兵')" style="margin-left: 10px" @click="switchView">
           切换视图
         </el-button>
-        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px" @click="exportList">
+        <el-button v-if="listQuery.typeName.includes('管网哨兵')" type="primary" style="margin-left: 10px"
+          @click="exportList">
           导出
         </el-button>
       </div>
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index df8dec7..ae1ee20 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -232,6 +232,9 @@
     else {
       alarmEventList.value = []
     }
+    if (!isFisrst.value) {
+      dataForm.value.alarmThreshold = ''
+    }
   }
 }, {
   deep: true,
@@ -239,7 +242,7 @@
 })
 const currentProduct = ref<any>({})
 watch(() => dataForm.value.productId, (newVal) => {
-  if(newVal) {
+  if (newVal) {
     currentProduct.value = productList.value.filter(item => item.id === newVal)[0]
     console.log(currentProduct.value, 'currentProduct.value')
   }
@@ -258,6 +261,13 @@
   deep: true,
   immediate: true,
 })
+// watch(() => dataForm.value.alarmThreshold, (newVal) => {
+//   if (newVal) {
+//     if (!isFisrst.value) {
+//       dataForm.value.alarmThreshold = ''
+//     }
+//   }
+// })
 </script>
 
 <template>
@@ -318,8 +328,9 @@
         <!-- 系统 -->
         <el-col v-if="dataForm.alarmJudgeMethod === '1'" :span="12">
           <el-form-item label="报警阈值" prop="alarmThreshold">
-            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number" style="width: 50%;" />
-            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL'}}
+            <el-input v-model.trim="dataForm.alarmThreshold" min="0" placeholder="报警阈值" type="number"
+              style="width: 50%;" />
+            {{ currentProduct?.name.includes('云台') ? 'PPM.M' : '%LEL' }}
           </el-form-item>
         </el-col>
         <!-- 设备 -->
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 2ce1653..5196d54 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -60,18 +60,31 @@
     ElMessage.warning('获取设备ID失败')
   })
 }
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
+const loading = ref(false)
 // 点击树形结构
 const handleNodeClick = (data: any, node: any) => {
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
-    console.log(data, '点击')
+    // console.log(data, '点击')
     const deviceCode = data.DEVICECODE
+    // const deviceCode = 'WXD7507'
     if (deviceCode) {
+      loading.value = true
       clearInterval(timer.value)
       timer.value = null
       playerVideo(deviceCode)
       // 更新echarts
-
+      fetchEchartsData({
+        devCode: deviceCode,
+        begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      })
     }
     else {
       ElMessage.warning('缺少设备编号')
@@ -89,17 +102,19 @@
 const fetchTreeData = () => {
   loadingTree.value = true
   const setData = (data1: any[], data2: any[]) => {
-    const data = data2.filter((item: any) => item.DEPTID).map((item: any) => ({
+    const data = data2.filter((item: any) => item.DEPTID).map((item: any, index: number) => ({
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}-${index}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}-${index}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
       pid: item.DEPTID,
       value: '',
     }))
+    console.log(data)
     const all = [...data1, ...data]
     expandedKeys.value = []
     all.forEach(element => {
@@ -108,19 +123,6 @@
       }
     })
     treeData.value = toTreeList(all, '0', true)
-    // 设置默认选中
-    // setTimeout(() => {
-    //   if(data.length) {
-    //     console.log(data[0], 'data[0]')
-    //     console.log(data[1], 'data[0]')
-    //     treeRef.value.setCurrentKey(data[0].id)
-    //     nextTick(() => {
-    //       treeRef.value.scrollToNode(data[0].id)
-    //       // 播放视频
-
-    //     })
-    //   }
-    // })
   }
   const fetch = async () => {
     try {
@@ -135,6 +137,7 @@
     }
   }
   indexDB.getAll().then(allData => {
+    loadingTree.value = true
     if (allData.filter((item: any) => item.name === 'all-dept-list').length) {
       const list = JSON.parse(allData.filter((item: any) => item.name === 'all-dept-list')[0].data).filter((item: any) => item.id !== '0')
       if (allData.filter((item: any) => item.name === 'all-video-list').length) {
@@ -148,6 +151,7 @@
     }
     else {
       fetch()
+      loadingTree.value = false
     }
   })
 
@@ -173,16 +177,17 @@
   window.addEventListener('resize', () => { })
 })
 // 获取echarts数据
-const fetchEchartsData = (obj: any) => {
+function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).reverse().map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).reverse().map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
+    resizePage()
     if (!timer.value && xAxisData.value.length) {
       if (timer.value) {
         clearInterval(timer.value)
@@ -190,12 +195,21 @@
       }
       timer.value = setInterval(() => {
         fetchEchartsData({ ...obj, begTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs().format('YYYY-MM-DD HH:mm:ss') })
-      }, 1000 * 60 *20);
+      }, 1000 * 60 * 20);
     }
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
   })
 }
 const currentConcentration = computed(() => {
-  return data.value[0]?.data.length ? data.value[0]?.data.CONCENTRATION : ''
+  if (data.value[0]?.data.length) {
+    const length = data.value[0]?.data.length
+    return data.value[0]?.data[length - 1]
+  }
+  else {
+    return ''
+  }
 })
 // 视频播放失败
 const playerError = (info: string) => {
@@ -203,13 +217,6 @@
 }
 const iWidth = ref(window.innerWidth - 180)
 const iHeight = ref(window.innerHeight * 0.55)
-// console.log(iWidth, iHeight)
-const resizePage = () => {
-  setTimeout(() => {
-    const resize = new Event('resize')
-    window.dispatchEvent(resize)
-  }, 200)
-}
 const complete = () => {
   resizePage()
 }
@@ -227,7 +234,7 @@
       <!-- 左侧组织机构 -->
       <div class="left-container">
         <div class="dept-div">
-          <el-card class="box-card" shadow="always">
+          <el-card v-loading="loadingTree" class="box-card" shadow="always">
             <template #header>
               <div class="clearfix">
                 <!-- <div>监控点列表</div> -->
@@ -261,7 +268,7 @@
                 <span>当前浓度：{{ currentConcentration }}PPM.M</span>
                 <!-- <span style="margin-left: 50px;">报警阈值：50%LEL</span> -->
               </div>
-              <div class="chart">
+              <div class="chart" v-loading="loading">
                 <line-chart v-show="xAxisData.length" :x-axis-data="xAxisData" :data="data" :gradient="false"
                   :smooth="false" unit="%LEL"
                   :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }" />
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index ef2bd48..b6f59b3 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -221,6 +221,7 @@
 const changeVideo = (item: any) => {
   currentVideo.value = item.name
   // 切换云台播放
+  unref(playRef).playerFun.stopAllPlay()
   videoType.value = 'real'
   playerVideo(item.devcode)
 }
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index 17bb85d..e72282f 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -7,12 +7,14 @@
 import dayjs from 'dayjs'
 import { getDeviceGasData } from '@/api/home/station/station'
 import { getAlarmThresholdByCode } from '@/api/home/device/device'
+import { ElMessage } from 'element-plus'
 const $props = defineProps({
   devcode: {
     type: String,
     required: true,
   }
 })
+const emits = defineEmits(['playback'])
 const $route = useRoute()
 // 列表loading
 const loadingTable = ref(false)
@@ -67,18 +69,8 @@
   }).then(res => {
     // console.log(res.data, '123123')
     list.value = (res.data || []).reverse()
-    // list.value = [
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '11100.00',
-    //   },
-    //   {
-    //     LOGTIME: '2025-01-20 00:00:00',
-    //     CONCENTRATION: '1110.00',
-    //   },
-    // ]
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME)
+      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -106,7 +98,7 @@
       data.value = [
         {
           name: '浓度',
-          data: list.value.map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -162,10 +154,6 @@
     resizePage()
   }
 }
-// 查看
-const detail = (row: any) => {
-
-}
 
 watch(() => $props.devcode, (newVal) => {
   if (newVal) {
@@ -222,10 +210,23 @@
     else {
       setTimeout(() => {
         fetchData(true)
-      }, 1000 * 60 *5)
+      }, 1000 * 60 * 5)
     }
   }
 }
+
+// 回放
+const playback = (row: any) => {
+  if (!row.LOGTIME) {
+    ElMessage.warning('该数据无时间')
+    return
+  }
+  const obj = {
+    start: dayjs(row.LOGTIME).subtract(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+    end: dayjs(row.LOGTIME).add(5, 'second').format('YYYY-MM-DD HH:mm:ss'),
+  }
+  emits('playback', obj)
+}
 </script>
 
 <template>
@@ -256,7 +257,7 @@
       <template #columns>
         <el-table-column label="操作" align="center" width="70">
           <template #default="scope">
-            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="detail(scope.row)">
+            <el-button v-if="scope.row.status === '报警'" type="primary" link size="small" @click="playback(scope.row)">
               回放
             </el-button>
           </template>
@@ -264,7 +265,8 @@
       </template>
     </normal-table>
     <div v-show="!isShowTable" style="width: 100%;height: 370px;">
-      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false" :smooth="false"
+      <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" :data="data" :gradient="false"
+        :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
         :grid="{
           top: 50,
@@ -273,7 +275,7 @@
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
-        <el-empty v-show="!list.length" description="暂无数据" />
+      <el-empty v-show="!list.length" description="暂无数据" />
     </div>
   </table-container>
 </template>
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 29cddac..9e3bb92 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -129,6 +129,25 @@
     })
   }
 }
+// 燃气列表报警回放
+const playback = (obj: any) => {
+  unref(playRef).playerFun.stopAllPlay()
+  videoType.value = 'playback'
+  getVideoBackUrl({
+      deviceId: currentDeviceId.value,
+      beginDate: obj.start,
+      endDate: obj.end
+    }).then(res => {
+      if (!res.data) {
+        ElMessage.warning('回放地址为空')
+        return
+      }
+      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(obj.start).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(obj.end).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+    }).catch(() => {
+      ElMessage.warning('获取回放地址失败')
+    })
+}
 onMounted(() => {
   resizePage()
 })
@@ -163,7 +182,7 @@
     </div>
     <!-- 浓度数据展示区域 -->
     <div class="right-gas">
-      <monitor-data-gas-list :devcode="devcode"  />
+      <monitor-data-gas-list :devcode="devcode" @playback="playback"  />
     </div>
   </div>
 </template>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 96808e4..7cbc1e1 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -35,7 +35,6 @@
       ElMessage('设备ID为空，无法获取视频')
       return
     }
-    // currentDeviceId.value = deviceId
     getVideoUrl({
       deviceId: deviceId,
       streamType: '0'
@@ -47,11 +46,8 @@
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
   }).catch(() => {
-    // currentDeviceId.value = ''
     ElMessage.warning('获取设备ID失败')
   })
 }
@@ -60,24 +56,39 @@
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
-const handleNodeClick = (data: any) => {
-  // && data.DEVICECODE
-  if (data.id.includes('station') ) {
+const handleNodeClick = (data: any, status: boolean) => {
+  if(!data.DEVCODE && status) {
+    ElMessage.warning('设备编号为空')
+    treeRef.value.setChecked(data.id, false)
+    return
+  }
+  if (data.id.includes('station') && status) {
     // 点击的设备(加载视频)
-    console.log('station', data)
+    // console.log('station', data)
+    // data.DEVCODE = 'WXD7507'
     // 添加到视频数组
-    // if(videoList.value.filter((item:any) => item.DEVICECODE === data.DEVICECODE).length) {
-    // }
-    // else {
-      if(videoList.value.filter((item) => item.id).length === 4) {
-        treeRef.value.setChecked(videoList.value[3].id, false)
-      }
-      videoList.value.unshift(data)
-      // 播放
-      playerVideo(data.DEVICECODE, playRef1)
+    if (videoList.value.filter((item) => item.id).length === 4) {
+      treeRef.value.setChecked(videoList.value[3].id, false)
+    }
+    videoList.value.unshift(data)
+    // 播放当前
+    playerVideo(data.DEVCODE, playRef1.value)
+    videoList.value.pop()
+    videoList.value.forEach((item,index) => {
+       if(item.id && index!== 0) {
+        const dict = {
+          1: playRef2.value,
+          2: playRef3.value,
+          3: playRef4.value
+        }
+        playerVideo(item.DEVCODE, dict[index])
+       }
+    })
 
-      videoList.value.pop()
-    // }
+  }
+  else if (data.id.includes('station') && !status) {
+    videoList.value = videoList.value.filter((item) => item.id !== data.id)
+    videoList.value.push({})
   }
 }
 // 查询组织机构
@@ -95,7 +106,8 @@
       ...item,
       checked: false,
       code: '',
-      id: `station-${item.DEVICECODE}-${item.LEDGER_CODE}`,
+      id: `station-${item.DEVCODE}-${item.LEDGER_CODE}`,
+      // id: `station-${'WXD7507'}-${item.LEDGER_CODE}`,
       name: `${item.LEDGER_NAME}云台`,
       open: false,
       pCodes: '',
@@ -187,7 +199,7 @@
                 :expand-on-click-node="false" @node-click="handleNodeClick" /> -->
               <el-tree-v2 v-if="treeData.length" ref="treeRef" :data="treeData" :props="defaultProps"
                 :height="treeHeight" :check-on-click-node="true" :default-expanded-keys="expandedKeys"
-                @node-click="handleNodeClick" :filter-method="filterTree" empty-text="暂无组织数据" show-checkbox
+                @check-change="handleNodeClick" :filter-method="filterTree" empty-text="暂无组织数据" show-checkbox
                 :highlight-current="true" />
 
             </el-scrollbar>
@@ -201,10 +213,26 @@
             <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
               controls autoplay /> -->
             <!-- videoList -->
-            <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[0]?.name }}</span>
+              <player :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
+            </div>
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[1]?.name }}</span>
+              <player :playId="`video-player-${1}`" ref="playRef2" @error="playerError" />
+            </div>
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[2]?.name }}</span>
+              <player :playId="`video-player-${2}`" ref="playRef3" @error="playerError" />
+            </div>
+            <div class="video mar-bottom">
+              <span class="title">{{ videoList[3]?.name }}</span>
+              <player :playId="`video-player-${3}`" ref="playRef4" @error="playerError" />
+            </div>
+            <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
               <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div>
+            </div> -->
           </div>
         </el-card>
       </div>
@@ -240,9 +268,12 @@
   width: 49%;
   height: 40vh;
   position: relative;
+
   .title {
     position: absolute;
-    top:5px;
+    top: 5px;
+    right: 5px;
+    text-align: right;
     color: #fff;
     z-index: 9;
     left: 10px;
diff --git a/src/views/home/well/components/monitorData.vue b/src/views/home/well/components/monitorData.vue
index 196b3b8..191615c 100644
--- a/src/views/home/well/components/monitorData.vue
+++ b/src/views/home/well/components/monitorData.vue
@@ -18,7 +18,7 @@
 const NoAllData = ref(false)
 onMounted(() => {
   getMonitorData({ wellId: $route.query.id as string }).then((res) => {
-    if (res.data['燃气智能监测终端'] || res.data['燃气智能监测终端（一体化）']) {
+    if (res.data['燃气智能监测终端'] || res.data['燃气智能监测终端（一体化）'] || res.data['管网哨兵']|| res.data['管网哨兵(一体化)']) {
       showGas.value = true
       activeName.value = '燃气浓度'
     }
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index e362dfb..28e88a1 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,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['燃气智能监测终端（一体化）'] || res.data['管网哨兵']|| res.data['管网哨兵（一体化）'] || []
+    list.value = res.data['燃气智能监测终端'] || res.data['燃气智能监测终端（一体化）'] || res.data['管网哨兵']|| res.data['管网哨兵(一体化)'] || []
     loadingTable.value = false
     xAxisData.value = list.value.slice().reverse().map((item: any) => item.logtime)