diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 4eb8c05..dbcf2f1 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -69,15 +69,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -442,8 +442,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -454,7 +454,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 4eb8c05..dbcf2f1 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -69,15 +69,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -442,8 +442,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -454,7 +454,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index c98a38f..a6c7d24 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -8,7 +8,11 @@
 import player from '@/components/HKplayer/index.vue'
 import { ElMessage } from 'element-plus'
 import { getDeviceById } from '@/api/home/well/well'
-import { getDeviceID, getVideoUrl, getVideoBackUrl } from '@/api/home/station/video'
+import {
+  getDeviceID,
+  getVideoUrl,
+  getVideoBackUrl
+} from '@/api/home/station/video'
 import dayjs from 'dayjs'
 const dialogFormVisible = ref(false)
 const $route = useRoute()
@@ -20,7 +24,7 @@
   ledgerName: '', // 场站名称
   lngGaode: '',
   latGaode: '',
-  tagNumber: '',
+  tagNumber: ''
 })
 const resizePage = () => {
   setTimeout(() => {
@@ -31,7 +35,7 @@
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
 
-const videoType = ref('real')  // 视频类型   实时real和回放playback
+const videoType = ref('real') // 视频类型   实时real和回放playback
 // 详细信息
 const detailInfo = ref<{ [key: string]: string }>({})
 // 描述列表数据
@@ -39,39 +43,39 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '场站状态',
     value: 'onStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
 
   {
     text: '负责人',
     value: 'personName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '标签',
     value: 'marker',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
     value: 'monitorStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '当前浓度',
   //   value: '',
@@ -125,7 +129,6 @@
   //   value: 'latGaode',
   //   align: 'center',
   // },
-
 ])
 const currentDeviceId = ref('')
 const playerVideo = (devcode: string) => {
@@ -134,31 +137,35 @@
     return
   }
   // unref(playRef).playerFun.createPlayer('ws://172.17.240.101:559/media?version=0.1&ciphersuites=0&sessionID', 1)
-  getDeviceID(devcode).then(res => {
-    const deviceId = res.data
-    if (!deviceId) {
-      ElMessage('设备ID为空，无法获取视频')
-      return
-    }
-    currentDeviceId.value = deviceId
-    getVideoUrl({
-      deviceId: deviceId,
-      streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
+  getDeviceID(devcode)
+    .then(res => {
+      const deviceId = res.data
+      if (!deviceId) {
+        ElMessage('设备ID为空，无法获取视频')
         return
       }
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
+      currentDeviceId.value = deviceId
+      getVideoUrl({
+        deviceId: deviceId,
+        streamType: '0'
+      })
+        .then(res => {
+          const videoUrl = res.data
+          if (!videoUrl) {
+            ElMessage('视频地址为空，无法播放')
+            return
+          }
+          // 播放视频
+          unref(playRef).playerFun.createPlayer(videoUrl, 1)
+        })
+        .catch(() => {
+          ElMessage.warning('获取设备视频失败')
+        })
     })
-  }).catch(() => {
-    currentDeviceId.value = ''
-    ElMessage.warning('获取设备ID失败')
-  })
+    .catch(() => {
+      currentDeviceId.value = ''
+      ElMessage.warning('获取设备ID失败')
+    })
 }
 // 初始化
 const playRef = ref()
@@ -175,32 +182,35 @@
   resizePage()
   // 获取详细信息
   loading.value = true
-  getWellDetail(e.info.id).then((res) => {
-    detailInfo.value = res.data
-    loading.value = false
-    if (res.data.personName && res.data.telephone) {
-      detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
-    }
-    // 处理监控状态
-    if (detailInfo.value.monitorStateName === '离线' && !$route.path.includes('station')) {
-      detailInfo.value.monitorStateName = '故障(离线)'
-    }
-    getDeviceById(e.info.id).then(res => {
-      deviceList.value = res.data.map((item: any) => ({
-        name: `${item.devcode}`,
-        devcode: item.devcode,
-      }))
-      if (deviceList.value.length) {
-        currentVideo.value = deviceList.value[0].name
-        // 默认播放第一路视频 (先获取设备id再根据id拿视频)
-        playerVideo(deviceList.value[0].devcode)
+  getWellDetail(e.info.id)
+    .then(res => {
+      detailInfo.value = res.data
+      loading.value = false
+      if (res.data.personName && res.data.telephone) {
+        detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
       }
+      // 处理监控状态
+      if (
+        detailInfo.value.monitorStateName === '离线' &&
+        !$route.path.includes('station')
+      ) {
+        detailInfo.value.monitorStateName = '故障(离线)'
+      }
+      getDeviceById(e.info.id).then(res => {
+        deviceList.value = res.data.map((item: any) => ({
+          name: `${item.devcode}`,
+          devcode: item.devcode
+        }))
+        if (deviceList.value.length) {
+          currentVideo.value = deviceList.value[0].name
+          // 默认播放第一路视频 (先获取设备id再根据id拿视频)
+          playerVideo(deviceList.value[0].devcode)
+        }
+      })
     })
-
-
-  }).catch(() => {
-    loading.value = false
-  })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -213,8 +223,8 @@
   $router.push({
     path: '/station/detail',
     query: {
-      id: detailInfo.value.id,
-    },
+      id: detailInfo.value.id
+    }
   })
   close()
 }
@@ -246,104 +256,267 @@
     getVideoUrl({
       deviceId: currentDeviceId.value,
       streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
-        return
-      }
-
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
-  }
-  else if (type === 'playback') {
+      .then(res => {
+        const videoUrl = res.data
+        if (!videoUrl) {
+          ElMessage('视频地址为空，无法播放')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+
+        // 播放视频
+        unref(playRef).playerFun.createPlayer(videoUrl, 1)
+      })
+      .catch(() => {
+        ElMessage.warning('获取设备视频失败')
+        unref(playRef).playerFun.stopAllPlay()
+      })
+  } else if (type === 'playback') {
     unref(playRef).playerFun.stopAllPlay()
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
       endDate: endTime
-    }).then(res => {
-      if (!res.data) {
-        ElMessage.warning('回放地址为空')
-        return
-      }
-      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
-    }).catch(() => {
-      ElMessage.warning('获取回放地址失败')
     })
+      .then(res => {
+        if (!res.data) {
+          ElMessage.warning('回放地址为空')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+        // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    //     const startTime = dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    // const endTime = dayjs(getFullTime()).add(2, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        unref(playRef).playerFun.replayFun({
+          url: res.data,
+          startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        })
+      })
+      .catch(() => {
+        ElMessage.warning('获取回放地址失败')
+         unref(playRef).playerFun.stopAllPlay()
+      })
   }
 }
 // const url = ref('')
 // const testVideo = () => {
 //   unref(playRef).playerFun.createPlayer(url.value, 1)
 // }
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
   <div class="dialog">
-    <el-dialog v-model="dialogFormVisible" append-to-body class="dialog" custom-class="dialog" :show-close="false"
-      width="950px" style="background-color: transparent;box-shadow: none;">
-      <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <el-dialog
+      v-model="dialogFormVisible"
+      append-to-body
+      class="dialog"
+      custom-class="dialog"
+      :show-close="false"
+      width="950px"
+      style="background-color: transparent; box-shadow: none"
+    >
+      <div
+        v-show="dialogFormVisible"
+        class="container clearfix"
+        @mouseleave="() => {}"
+      >
         <div class="header">
-          <div style="display: flex;align-items: center;">
-            <el-tooltip class="box-item" effect="dark" :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
-              placement="top">
-              <span class="title">{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span>
+          <div style="display: flex; align-items: center">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
+              placement="top"
+            >
+              <span class="title"
+                >{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span
+              >
             </el-tooltip>
-            <el-button size="small" style="margin-left: 10px;" @click="goDetail">
+            <el-button size="small" style="margin-left: 10px" @click="goDetail">
               详情
             </el-button>
           </div>
           <span class="close1" @click="close">×</span>
         </div>
         <!-- 云台视频 -->
-        <div v-if="deviceList.length" class="video">
+        <div v-if="deviceList.length" class="video" :style="{height: `${videoType === 'playback'? 370 : 290}px`}">
           <div class="video-menu">
-            <div v-for="item in deviceList" :key="item" class="menu-item"
-              :class="item.name === currentVideo ? 'active' : ''" @click="changeVideo(item)">
+            <div
+              v-for="item in deviceList"
+              :key="item"
+              class="menu-item"
+              :class="item.name === currentVideo ? 'active' : ''"
+              @click="changeVideo(item)"
+            >
               {{ item.name }}
             </div>
           </div>
           <div class="video-container">
             <div class="video-control">
-              <div style="width: 50%;display: flex;justify-content: center;">
-                <el-button :type="videoType === 'real' ? 'primary' : ''" round size="small" @click="handler('real')">
+              <div style="width: 50%; display: flex; justify-content: center">
+                <el-button
+                  :type="videoType === 'real' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handler('real')"
+                >
                   预览
                 </el-button>
-                <el-button :type="videoType === 'playback' ? 'primary' : ''" round size="small"
-                  @click="handler('playback')">
+                <el-button
+                  :type="videoType === 'playback' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handleTimeChange"
+                >
                   回放
                 </el-button>
-                <el-button round size="small">
-                  报警
-                </el-button>
+                <el-button round size="small"> 报警 </el-button>
                 <!-- <el-button round size="small" @click="testVideo" >
                   测试播放
                 </el-button>
                 <el-input v-model="url" style="width: 1000px;height: 30px;" clearable></el-input> -->
               </div>
             </div>
-            <div class="video-player" style="width: 710px;height: 250px;">
+            <div class="video-player" style="width: 710px; height: 250px">
               <!-- <video src="" autoplay muted controls /> -->
-              <player v-if="dialogFormVisible" ref="playRef" @error="playerError" :iWidth="710" :iHeight="250" />
+              <player
+                v-if="dialogFormVisible"
+                ref="playRef"
+                @error="playerError"
+                :iWidth="710"
+                :iHeight="250"
+              />
             </div>
+              <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
           </div>
         </div>
         <div class="body">
           <div class="descriptions" v-loading="loading">
-            <div v-for="(item, index) in descriptionsList" :key="item.text"
-              :style="{ width: index % 2 === 0 ? '65%' : '32%' }" class="descriptions-item">
+            <div
+              v-for="(item, index) in descriptionsList"
+              :key="item.text"
+              :style="{ width: index % 2 === 0 ? '65%' : '32%' }"
+              class="descriptions-item"
+            >
               <div :class="index % 2 === 0 ? 'label' : 'label1'">
                 {{ item.text }}
               </div>
-              <div v-if="item.text !== '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'"
-                :title="detailInfo[item.value] || ''">
+              <div
+                v-if="item.text !== '当前浓度'"
+                :class="index % 2 === 0 ? 'value' : 'value1'"
+                :title="detailInfo[item.value] || ''"
+              >
                 {{ detailInfo[item.value] || '' }}
               </div>
               <!-- <div v-if="item.text === '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'">
@@ -354,6 +527,7 @@
               </div> -->
             </div>
           </div>
+          
         </div>
       </div>
     </el-dialog>
@@ -361,6 +535,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container {
   width: 100%;
   background: #fff;
@@ -370,7 +556,6 @@
   overflow: hidden;
   box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
-
   .header {
     float: right;
     background-color: #0d76d4;

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 4eb8c05..dbcf2f1 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -69,15 +69,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -442,8 +442,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -454,7 +454,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index c98a38f..a6c7d24 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -8,7 +8,11 @@
 import player from '@/components/HKplayer/index.vue'
 import { ElMessage } from 'element-plus'
 import { getDeviceById } from '@/api/home/well/well'
-import { getDeviceID, getVideoUrl, getVideoBackUrl } from '@/api/home/station/video'
+import {
+  getDeviceID,
+  getVideoUrl,
+  getVideoBackUrl
+} from '@/api/home/station/video'
 import dayjs from 'dayjs'
 const dialogFormVisible = ref(false)
 const $route = useRoute()
@@ -20,7 +24,7 @@
   ledgerName: '', // 场站名称
   lngGaode: '',
   latGaode: '',
-  tagNumber: '',
+  tagNumber: ''
 })
 const resizePage = () => {
   setTimeout(() => {
@@ -31,7 +35,7 @@
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
 
-const videoType = ref('real')  // 视频类型   实时real和回放playback
+const videoType = ref('real') // 视频类型   实时real和回放playback
 // 详细信息
 const detailInfo = ref<{ [key: string]: string }>({})
 // 描述列表数据
@@ -39,39 +43,39 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '场站状态',
     value: 'onStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
 
   {
     text: '负责人',
     value: 'personName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '标签',
     value: 'marker',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
     value: 'monitorStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '当前浓度',
   //   value: '',
@@ -125,7 +129,6 @@
   //   value: 'latGaode',
   //   align: 'center',
   // },
-
 ])
 const currentDeviceId = ref('')
 const playerVideo = (devcode: string) => {
@@ -134,31 +137,35 @@
     return
   }
   // unref(playRef).playerFun.createPlayer('ws://172.17.240.101:559/media?version=0.1&ciphersuites=0&sessionID', 1)
-  getDeviceID(devcode).then(res => {
-    const deviceId = res.data
-    if (!deviceId) {
-      ElMessage('设备ID为空，无法获取视频')
-      return
-    }
-    currentDeviceId.value = deviceId
-    getVideoUrl({
-      deviceId: deviceId,
-      streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
+  getDeviceID(devcode)
+    .then(res => {
+      const deviceId = res.data
+      if (!deviceId) {
+        ElMessage('设备ID为空，无法获取视频')
         return
       }
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
+      currentDeviceId.value = deviceId
+      getVideoUrl({
+        deviceId: deviceId,
+        streamType: '0'
+      })
+        .then(res => {
+          const videoUrl = res.data
+          if (!videoUrl) {
+            ElMessage('视频地址为空，无法播放')
+            return
+          }
+          // 播放视频
+          unref(playRef).playerFun.createPlayer(videoUrl, 1)
+        })
+        .catch(() => {
+          ElMessage.warning('获取设备视频失败')
+        })
     })
-  }).catch(() => {
-    currentDeviceId.value = ''
-    ElMessage.warning('获取设备ID失败')
-  })
+    .catch(() => {
+      currentDeviceId.value = ''
+      ElMessage.warning('获取设备ID失败')
+    })
 }
 // 初始化
 const playRef = ref()
@@ -175,32 +182,35 @@
   resizePage()
   // 获取详细信息
   loading.value = true
-  getWellDetail(e.info.id).then((res) => {
-    detailInfo.value = res.data
-    loading.value = false
-    if (res.data.personName && res.data.telephone) {
-      detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
-    }
-    // 处理监控状态
-    if (detailInfo.value.monitorStateName === '离线' && !$route.path.includes('station')) {
-      detailInfo.value.monitorStateName = '故障(离线)'
-    }
-    getDeviceById(e.info.id).then(res => {
-      deviceList.value = res.data.map((item: any) => ({
-        name: `${item.devcode}`,
-        devcode: item.devcode,
-      }))
-      if (deviceList.value.length) {
-        currentVideo.value = deviceList.value[0].name
-        // 默认播放第一路视频 (先获取设备id再根据id拿视频)
-        playerVideo(deviceList.value[0].devcode)
+  getWellDetail(e.info.id)
+    .then(res => {
+      detailInfo.value = res.data
+      loading.value = false
+      if (res.data.personName && res.data.telephone) {
+        detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
       }
+      // 处理监控状态
+      if (
+        detailInfo.value.monitorStateName === '离线' &&
+        !$route.path.includes('station')
+      ) {
+        detailInfo.value.monitorStateName = '故障(离线)'
+      }
+      getDeviceById(e.info.id).then(res => {
+        deviceList.value = res.data.map((item: any) => ({
+          name: `${item.devcode}`,
+          devcode: item.devcode
+        }))
+        if (deviceList.value.length) {
+          currentVideo.value = deviceList.value[0].name
+          // 默认播放第一路视频 (先获取设备id再根据id拿视频)
+          playerVideo(deviceList.value[0].devcode)
+        }
+      })
     })
-
-
-  }).catch(() => {
-    loading.value = false
-  })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -213,8 +223,8 @@
   $router.push({
     path: '/station/detail',
     query: {
-      id: detailInfo.value.id,
-    },
+      id: detailInfo.value.id
+    }
   })
   close()
 }
@@ -246,104 +256,267 @@
     getVideoUrl({
       deviceId: currentDeviceId.value,
       streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
-        return
-      }
-
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
-  }
-  else if (type === 'playback') {
+      .then(res => {
+        const videoUrl = res.data
+        if (!videoUrl) {
+          ElMessage('视频地址为空，无法播放')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+
+        // 播放视频
+        unref(playRef).playerFun.createPlayer(videoUrl, 1)
+      })
+      .catch(() => {
+        ElMessage.warning('获取设备视频失败')
+        unref(playRef).playerFun.stopAllPlay()
+      })
+  } else if (type === 'playback') {
     unref(playRef).playerFun.stopAllPlay()
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
       endDate: endTime
-    }).then(res => {
-      if (!res.data) {
-        ElMessage.warning('回放地址为空')
-        return
-      }
-      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
-    }).catch(() => {
-      ElMessage.warning('获取回放地址失败')
     })
+      .then(res => {
+        if (!res.data) {
+          ElMessage.warning('回放地址为空')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+        // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    //     const startTime = dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    // const endTime = dayjs(getFullTime()).add(2, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        unref(playRef).playerFun.replayFun({
+          url: res.data,
+          startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        })
+      })
+      .catch(() => {
+        ElMessage.warning('获取回放地址失败')
+         unref(playRef).playerFun.stopAllPlay()
+      })
   }
 }
 // const url = ref('')
 // const testVideo = () => {
 //   unref(playRef).playerFun.createPlayer(url.value, 1)
 // }
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
   <div class="dialog">
-    <el-dialog v-model="dialogFormVisible" append-to-body class="dialog" custom-class="dialog" :show-close="false"
-      width="950px" style="background-color: transparent;box-shadow: none;">
-      <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <el-dialog
+      v-model="dialogFormVisible"
+      append-to-body
+      class="dialog"
+      custom-class="dialog"
+      :show-close="false"
+      width="950px"
+      style="background-color: transparent; box-shadow: none"
+    >
+      <div
+        v-show="dialogFormVisible"
+        class="container clearfix"
+        @mouseleave="() => {}"
+      >
         <div class="header">
-          <div style="display: flex;align-items: center;">
-            <el-tooltip class="box-item" effect="dark" :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
-              placement="top">
-              <span class="title">{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span>
+          <div style="display: flex; align-items: center">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
+              placement="top"
+            >
+              <span class="title"
+                >{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span
+              >
             </el-tooltip>
-            <el-button size="small" style="margin-left: 10px;" @click="goDetail">
+            <el-button size="small" style="margin-left: 10px" @click="goDetail">
               详情
             </el-button>
           </div>
           <span class="close1" @click="close">×</span>
         </div>
         <!-- 云台视频 -->
-        <div v-if="deviceList.length" class="video">
+        <div v-if="deviceList.length" class="video" :style="{height: `${videoType === 'playback'? 370 : 290}px`}">
           <div class="video-menu">
-            <div v-for="item in deviceList" :key="item" class="menu-item"
-              :class="item.name === currentVideo ? 'active' : ''" @click="changeVideo(item)">
+            <div
+              v-for="item in deviceList"
+              :key="item"
+              class="menu-item"
+              :class="item.name === currentVideo ? 'active' : ''"
+              @click="changeVideo(item)"
+            >
               {{ item.name }}
             </div>
           </div>
           <div class="video-container">
             <div class="video-control">
-              <div style="width: 50%;display: flex;justify-content: center;">
-                <el-button :type="videoType === 'real' ? 'primary' : ''" round size="small" @click="handler('real')">
+              <div style="width: 50%; display: flex; justify-content: center">
+                <el-button
+                  :type="videoType === 'real' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handler('real')"
+                >
                   预览
                 </el-button>
-                <el-button :type="videoType === 'playback' ? 'primary' : ''" round size="small"
-                  @click="handler('playback')">
+                <el-button
+                  :type="videoType === 'playback' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handleTimeChange"
+                >
                   回放
                 </el-button>
-                <el-button round size="small">
-                  报警
-                </el-button>
+                <el-button round size="small"> 报警 </el-button>
                 <!-- <el-button round size="small" @click="testVideo" >
                   测试播放
                 </el-button>
                 <el-input v-model="url" style="width: 1000px;height: 30px;" clearable></el-input> -->
               </div>
             </div>
-            <div class="video-player" style="width: 710px;height: 250px;">
+            <div class="video-player" style="width: 710px; height: 250px">
               <!-- <video src="" autoplay muted controls /> -->
-              <player v-if="dialogFormVisible" ref="playRef" @error="playerError" :iWidth="710" :iHeight="250" />
+              <player
+                v-if="dialogFormVisible"
+                ref="playRef"
+                @error="playerError"
+                :iWidth="710"
+                :iHeight="250"
+              />
             </div>
+              <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
           </div>
         </div>
         <div class="body">
           <div class="descriptions" v-loading="loading">
-            <div v-for="(item, index) in descriptionsList" :key="item.text"
-              :style="{ width: index % 2 === 0 ? '65%' : '32%' }" class="descriptions-item">
+            <div
+              v-for="(item, index) in descriptionsList"
+              :key="item.text"
+              :style="{ width: index % 2 === 0 ? '65%' : '32%' }"
+              class="descriptions-item"
+            >
               <div :class="index % 2 === 0 ? 'label' : 'label1'">
                 {{ item.text }}
               </div>
-              <div v-if="item.text !== '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'"
-                :title="detailInfo[item.value] || ''">
+              <div
+                v-if="item.text !== '当前浓度'"
+                :class="index % 2 === 0 ? 'value' : 'value1'"
+                :title="detailInfo[item.value] || ''"
+              >
                 {{ detailInfo[item.value] || '' }}
               </div>
               <!-- <div v-if="item.text === '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'">
@@ -354,6 +527,7 @@
               </div> -->
             </div>
           </div>
+          
         </div>
       </div>
     </el-dialog>
@@ -361,6 +535,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container {
   width: 100%;
   background: #fff;
@@ -370,7 +556,6 @@
   overflow: hidden;
   box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
-
   .header {
     float: right;
     background-color: #0d76d4;
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 0bd414d..2294a5f 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -89,6 +89,7 @@
   // }
   if (!currentDeviceId.value) {
     ElMessage.warning('设备ID为空')
+    unref(playRef).playerFun.stopAllPlay()
     return
   }
   unref(playRef).playerFun.stopAllPlay()
@@ -102,17 +103,19 @@
       const videoUrl = res.data
       if (!videoUrl) {
         ElMessage('视频地址为空，无法播放')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
     }).catch(() => {
       ElMessage.warning('获取设备视频失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
   else if (type === 'playback') {
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
@@ -120,12 +123,14 @@
     }).then(res => {
       if (!res.data) {
         ElMessage.warning('回放地址为空')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
     }).catch(() => {
       ElMessage.warning('获取回放地址失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
 }
@@ -152,6 +157,88 @@
   resizePage()
 })
 const { proxy } = getCurrentInstance() as any
+
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
@@ -164,7 +251,7 @@
           <el-button :type="videoType === 'real' ? 'primary' : ''" round @click="handler('real')">
             预览
           </el-button>
-          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handler('playback')">
+          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handleTimeChange">
             回放
           </el-button>
         </div>
@@ -176,7 +263,34 @@
       </div>
       <!-- 云台控制按钮 -->
       <div>
-        <div class="control-btn">
+        <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;margin-top: 10px;margin-bottom: 15px;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
+        <div class="control-btn" v-if="videoType === 'real'">
           <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
@@ -189,6 +303,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container-station {
   width: 100%;
   display: flex;

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 4eb8c05..dbcf2f1 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -69,15 +69,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -442,8 +442,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -454,7 +454,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index c98a38f..a6c7d24 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -8,7 +8,11 @@
 import player from '@/components/HKplayer/index.vue'
 import { ElMessage } from 'element-plus'
 import { getDeviceById } from '@/api/home/well/well'
-import { getDeviceID, getVideoUrl, getVideoBackUrl } from '@/api/home/station/video'
+import {
+  getDeviceID,
+  getVideoUrl,
+  getVideoBackUrl
+} from '@/api/home/station/video'
 import dayjs from 'dayjs'
 const dialogFormVisible = ref(false)
 const $route = useRoute()
@@ -20,7 +24,7 @@
   ledgerName: '', // 场站名称
   lngGaode: '',
   latGaode: '',
-  tagNumber: '',
+  tagNumber: ''
 })
 const resizePage = () => {
   setTimeout(() => {
@@ -31,7 +35,7 @@
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
 
-const videoType = ref('real')  // 视频类型   实时real和回放playback
+const videoType = ref('real') // 视频类型   实时real和回放playback
 // 详细信息
 const detailInfo = ref<{ [key: string]: string }>({})
 // 描述列表数据
@@ -39,39 +43,39 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '场站状态',
     value: 'onStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
 
   {
     text: '负责人',
     value: 'personName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '标签',
     value: 'marker',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
     value: 'monitorStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '当前浓度',
   //   value: '',
@@ -125,7 +129,6 @@
   //   value: 'latGaode',
   //   align: 'center',
   // },
-
 ])
 const currentDeviceId = ref('')
 const playerVideo = (devcode: string) => {
@@ -134,31 +137,35 @@
     return
   }
   // unref(playRef).playerFun.createPlayer('ws://172.17.240.101:559/media?version=0.1&ciphersuites=0&sessionID', 1)
-  getDeviceID(devcode).then(res => {
-    const deviceId = res.data
-    if (!deviceId) {
-      ElMessage('设备ID为空，无法获取视频')
-      return
-    }
-    currentDeviceId.value = deviceId
-    getVideoUrl({
-      deviceId: deviceId,
-      streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
+  getDeviceID(devcode)
+    .then(res => {
+      const deviceId = res.data
+      if (!deviceId) {
+        ElMessage('设备ID为空，无法获取视频')
         return
       }
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
+      currentDeviceId.value = deviceId
+      getVideoUrl({
+        deviceId: deviceId,
+        streamType: '0'
+      })
+        .then(res => {
+          const videoUrl = res.data
+          if (!videoUrl) {
+            ElMessage('视频地址为空，无法播放')
+            return
+          }
+          // 播放视频
+          unref(playRef).playerFun.createPlayer(videoUrl, 1)
+        })
+        .catch(() => {
+          ElMessage.warning('获取设备视频失败')
+        })
     })
-  }).catch(() => {
-    currentDeviceId.value = ''
-    ElMessage.warning('获取设备ID失败')
-  })
+    .catch(() => {
+      currentDeviceId.value = ''
+      ElMessage.warning('获取设备ID失败')
+    })
 }
 // 初始化
 const playRef = ref()
@@ -175,32 +182,35 @@
   resizePage()
   // 获取详细信息
   loading.value = true
-  getWellDetail(e.info.id).then((res) => {
-    detailInfo.value = res.data
-    loading.value = false
-    if (res.data.personName && res.data.telephone) {
-      detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
-    }
-    // 处理监控状态
-    if (detailInfo.value.monitorStateName === '离线' && !$route.path.includes('station')) {
-      detailInfo.value.monitorStateName = '故障(离线)'
-    }
-    getDeviceById(e.info.id).then(res => {
-      deviceList.value = res.data.map((item: any) => ({
-        name: `${item.devcode}`,
-        devcode: item.devcode,
-      }))
-      if (deviceList.value.length) {
-        currentVideo.value = deviceList.value[0].name
-        // 默认播放第一路视频 (先获取设备id再根据id拿视频)
-        playerVideo(deviceList.value[0].devcode)
+  getWellDetail(e.info.id)
+    .then(res => {
+      detailInfo.value = res.data
+      loading.value = false
+      if (res.data.personName && res.data.telephone) {
+        detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
       }
+      // 处理监控状态
+      if (
+        detailInfo.value.monitorStateName === '离线' &&
+        !$route.path.includes('station')
+      ) {
+        detailInfo.value.monitorStateName = '故障(离线)'
+      }
+      getDeviceById(e.info.id).then(res => {
+        deviceList.value = res.data.map((item: any) => ({
+          name: `${item.devcode}`,
+          devcode: item.devcode
+        }))
+        if (deviceList.value.length) {
+          currentVideo.value = deviceList.value[0].name
+          // 默认播放第一路视频 (先获取设备id再根据id拿视频)
+          playerVideo(deviceList.value[0].devcode)
+        }
+      })
     })
-
-
-  }).catch(() => {
-    loading.value = false
-  })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -213,8 +223,8 @@
   $router.push({
     path: '/station/detail',
     query: {
-      id: detailInfo.value.id,
-    },
+      id: detailInfo.value.id
+    }
   })
   close()
 }
@@ -246,104 +256,267 @@
     getVideoUrl({
       deviceId: currentDeviceId.value,
       streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
-        return
-      }
-
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
-  }
-  else if (type === 'playback') {
+      .then(res => {
+        const videoUrl = res.data
+        if (!videoUrl) {
+          ElMessage('视频地址为空，无法播放')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+
+        // 播放视频
+        unref(playRef).playerFun.createPlayer(videoUrl, 1)
+      })
+      .catch(() => {
+        ElMessage.warning('获取设备视频失败')
+        unref(playRef).playerFun.stopAllPlay()
+      })
+  } else if (type === 'playback') {
     unref(playRef).playerFun.stopAllPlay()
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
       endDate: endTime
-    }).then(res => {
-      if (!res.data) {
-        ElMessage.warning('回放地址为空')
-        return
-      }
-      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
-    }).catch(() => {
-      ElMessage.warning('获取回放地址失败')
     })
+      .then(res => {
+        if (!res.data) {
+          ElMessage.warning('回放地址为空')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+        // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    //     const startTime = dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    // const endTime = dayjs(getFullTime()).add(2, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        unref(playRef).playerFun.replayFun({
+          url: res.data,
+          startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        })
+      })
+      .catch(() => {
+        ElMessage.warning('获取回放地址失败')
+         unref(playRef).playerFun.stopAllPlay()
+      })
   }
 }
 // const url = ref('')
 // const testVideo = () => {
 //   unref(playRef).playerFun.createPlayer(url.value, 1)
 // }
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
   <div class="dialog">
-    <el-dialog v-model="dialogFormVisible" append-to-body class="dialog" custom-class="dialog" :show-close="false"
-      width="950px" style="background-color: transparent;box-shadow: none;">
-      <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <el-dialog
+      v-model="dialogFormVisible"
+      append-to-body
+      class="dialog"
+      custom-class="dialog"
+      :show-close="false"
+      width="950px"
+      style="background-color: transparent; box-shadow: none"
+    >
+      <div
+        v-show="dialogFormVisible"
+        class="container clearfix"
+        @mouseleave="() => {}"
+      >
         <div class="header">
-          <div style="display: flex;align-items: center;">
-            <el-tooltip class="box-item" effect="dark" :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
-              placement="top">
-              <span class="title">{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span>
+          <div style="display: flex; align-items: center">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
+              placement="top"
+            >
+              <span class="title"
+                >{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span
+              >
             </el-tooltip>
-            <el-button size="small" style="margin-left: 10px;" @click="goDetail">
+            <el-button size="small" style="margin-left: 10px" @click="goDetail">
               详情
             </el-button>
           </div>
           <span class="close1" @click="close">×</span>
         </div>
         <!-- 云台视频 -->
-        <div v-if="deviceList.length" class="video">
+        <div v-if="deviceList.length" class="video" :style="{height: `${videoType === 'playback'? 370 : 290}px`}">
           <div class="video-menu">
-            <div v-for="item in deviceList" :key="item" class="menu-item"
-              :class="item.name === currentVideo ? 'active' : ''" @click="changeVideo(item)">
+            <div
+              v-for="item in deviceList"
+              :key="item"
+              class="menu-item"
+              :class="item.name === currentVideo ? 'active' : ''"
+              @click="changeVideo(item)"
+            >
               {{ item.name }}
             </div>
           </div>
           <div class="video-container">
             <div class="video-control">
-              <div style="width: 50%;display: flex;justify-content: center;">
-                <el-button :type="videoType === 'real' ? 'primary' : ''" round size="small" @click="handler('real')">
+              <div style="width: 50%; display: flex; justify-content: center">
+                <el-button
+                  :type="videoType === 'real' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handler('real')"
+                >
                   预览
                 </el-button>
-                <el-button :type="videoType === 'playback' ? 'primary' : ''" round size="small"
-                  @click="handler('playback')">
+                <el-button
+                  :type="videoType === 'playback' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handleTimeChange"
+                >
                   回放
                 </el-button>
-                <el-button round size="small">
-                  报警
-                </el-button>
+                <el-button round size="small"> 报警 </el-button>
                 <!-- <el-button round size="small" @click="testVideo" >
                   测试播放
                 </el-button>
                 <el-input v-model="url" style="width: 1000px;height: 30px;" clearable></el-input> -->
               </div>
             </div>
-            <div class="video-player" style="width: 710px;height: 250px;">
+            <div class="video-player" style="width: 710px; height: 250px">
               <!-- <video src="" autoplay muted controls /> -->
-              <player v-if="dialogFormVisible" ref="playRef" @error="playerError" :iWidth="710" :iHeight="250" />
+              <player
+                v-if="dialogFormVisible"
+                ref="playRef"
+                @error="playerError"
+                :iWidth="710"
+                :iHeight="250"
+              />
             </div>
+              <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
           </div>
         </div>
         <div class="body">
           <div class="descriptions" v-loading="loading">
-            <div v-for="(item, index) in descriptionsList" :key="item.text"
-              :style="{ width: index % 2 === 0 ? '65%' : '32%' }" class="descriptions-item">
+            <div
+              v-for="(item, index) in descriptionsList"
+              :key="item.text"
+              :style="{ width: index % 2 === 0 ? '65%' : '32%' }"
+              class="descriptions-item"
+            >
               <div :class="index % 2 === 0 ? 'label' : 'label1'">
                 {{ item.text }}
               </div>
-              <div v-if="item.text !== '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'"
-                :title="detailInfo[item.value] || ''">
+              <div
+                v-if="item.text !== '当前浓度'"
+                :class="index % 2 === 0 ? 'value' : 'value1'"
+                :title="detailInfo[item.value] || ''"
+              >
                 {{ detailInfo[item.value] || '' }}
               </div>
               <!-- <div v-if="item.text === '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'">
@@ -354,6 +527,7 @@
               </div> -->
             </div>
           </div>
+          
         </div>
       </div>
     </el-dialog>
@@ -361,6 +535,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container {
   width: 100%;
   background: #fff;
@@ -370,7 +556,6 @@
   overflow: hidden;
   box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
-
   .header {
     float: right;
     background-color: #0d76d4;
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 0bd414d..2294a5f 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -89,6 +89,7 @@
   // }
   if (!currentDeviceId.value) {
     ElMessage.warning('设备ID为空')
+    unref(playRef).playerFun.stopAllPlay()
     return
   }
   unref(playRef).playerFun.stopAllPlay()
@@ -102,17 +103,19 @@
       const videoUrl = res.data
       if (!videoUrl) {
         ElMessage('视频地址为空，无法播放')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
     }).catch(() => {
       ElMessage.warning('获取设备视频失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
   else if (type === 'playback') {
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
@@ -120,12 +123,14 @@
     }).then(res => {
       if (!res.data) {
         ElMessage.warning('回放地址为空')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
     }).catch(() => {
       ElMessage.warning('获取回放地址失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
 }
@@ -152,6 +157,88 @@
   resizePage()
 })
 const { proxy } = getCurrentInstance() as any
+
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
@@ -164,7 +251,7 @@
           <el-button :type="videoType === 'real' ? 'primary' : ''" round @click="handler('real')">
             预览
           </el-button>
-          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handler('playback')">
+          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handleTimeChange">
             回放
           </el-button>
         </div>
@@ -176,7 +263,34 @@
       </div>
       <!-- 云台控制按钮 -->
       <div>
-        <div class="control-btn">
+        <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;margin-top: 10px;margin-bottom: 15px;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
+        <div class="control-btn" v-if="videoType === 'real'">
           <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
@@ -189,6 +303,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container-station {
   width: 100%;
   display: flex;
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 5d32d49..3734639 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -122,15 +122,21 @@
   rowData.value = e.info.row
   loading.value = true
   gasData.value = []
+  //  ||
+    // rowData.value.deviceTypeName?.includes('智能警示桩')
   if (
     rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName?.includes('管网哨兵') ||
-    rowData.value.deviceTypeName?.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('管网哨兵')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+  //   descriptionsList.value.push({
+  //   text: '监控状态',
+  //   value: 'monitorStateName',
+  //   align: 'center'
+  // })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -152,7 +158,8 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName?.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') )) {
         return
       }
       if(res.data.installDate) {

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 4eb8c05..dbcf2f1 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -69,15 +69,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -442,8 +442,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -454,7 +454,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index c98a38f..a6c7d24 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -8,7 +8,11 @@
 import player from '@/components/HKplayer/index.vue'
 import { ElMessage } from 'element-plus'
 import { getDeviceById } from '@/api/home/well/well'
-import { getDeviceID, getVideoUrl, getVideoBackUrl } from '@/api/home/station/video'
+import {
+  getDeviceID,
+  getVideoUrl,
+  getVideoBackUrl
+} from '@/api/home/station/video'
 import dayjs from 'dayjs'
 const dialogFormVisible = ref(false)
 const $route = useRoute()
@@ -20,7 +24,7 @@
   ledgerName: '', // 场站名称
   lngGaode: '',
   latGaode: '',
-  tagNumber: '',
+  tagNumber: ''
 })
 const resizePage = () => {
   setTimeout(() => {
@@ -31,7 +35,7 @@
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
 
-const videoType = ref('real')  // 视频类型   实时real和回放playback
+const videoType = ref('real') // 视频类型   实时real和回放playback
 // 详细信息
 const detailInfo = ref<{ [key: string]: string }>({})
 // 描述列表数据
@@ -39,39 +43,39 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '场站状态',
     value: 'onStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
 
   {
     text: '负责人',
     value: 'personName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '标签',
     value: 'marker',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
     value: 'monitorStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '当前浓度',
   //   value: '',
@@ -125,7 +129,6 @@
   //   value: 'latGaode',
   //   align: 'center',
   // },
-
 ])
 const currentDeviceId = ref('')
 const playerVideo = (devcode: string) => {
@@ -134,31 +137,35 @@
     return
   }
   // unref(playRef).playerFun.createPlayer('ws://172.17.240.101:559/media?version=0.1&ciphersuites=0&sessionID', 1)
-  getDeviceID(devcode).then(res => {
-    const deviceId = res.data
-    if (!deviceId) {
-      ElMessage('设备ID为空，无法获取视频')
-      return
-    }
-    currentDeviceId.value = deviceId
-    getVideoUrl({
-      deviceId: deviceId,
-      streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
+  getDeviceID(devcode)
+    .then(res => {
+      const deviceId = res.data
+      if (!deviceId) {
+        ElMessage('设备ID为空，无法获取视频')
         return
       }
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
+      currentDeviceId.value = deviceId
+      getVideoUrl({
+        deviceId: deviceId,
+        streamType: '0'
+      })
+        .then(res => {
+          const videoUrl = res.data
+          if (!videoUrl) {
+            ElMessage('视频地址为空，无法播放')
+            return
+          }
+          // 播放视频
+          unref(playRef).playerFun.createPlayer(videoUrl, 1)
+        })
+        .catch(() => {
+          ElMessage.warning('获取设备视频失败')
+        })
     })
-  }).catch(() => {
-    currentDeviceId.value = ''
-    ElMessage.warning('获取设备ID失败')
-  })
+    .catch(() => {
+      currentDeviceId.value = ''
+      ElMessage.warning('获取设备ID失败')
+    })
 }
 // 初始化
 const playRef = ref()
@@ -175,32 +182,35 @@
   resizePage()
   // 获取详细信息
   loading.value = true
-  getWellDetail(e.info.id).then((res) => {
-    detailInfo.value = res.data
-    loading.value = false
-    if (res.data.personName && res.data.telephone) {
-      detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
-    }
-    // 处理监控状态
-    if (detailInfo.value.monitorStateName === '离线' && !$route.path.includes('station')) {
-      detailInfo.value.monitorStateName = '故障(离线)'
-    }
-    getDeviceById(e.info.id).then(res => {
-      deviceList.value = res.data.map((item: any) => ({
-        name: `${item.devcode}`,
-        devcode: item.devcode,
-      }))
-      if (deviceList.value.length) {
-        currentVideo.value = deviceList.value[0].name
-        // 默认播放第一路视频 (先获取设备id再根据id拿视频)
-        playerVideo(deviceList.value[0].devcode)
+  getWellDetail(e.info.id)
+    .then(res => {
+      detailInfo.value = res.data
+      loading.value = false
+      if (res.data.personName && res.data.telephone) {
+        detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
       }
+      // 处理监控状态
+      if (
+        detailInfo.value.monitorStateName === '离线' &&
+        !$route.path.includes('station')
+      ) {
+        detailInfo.value.monitorStateName = '故障(离线)'
+      }
+      getDeviceById(e.info.id).then(res => {
+        deviceList.value = res.data.map((item: any) => ({
+          name: `${item.devcode}`,
+          devcode: item.devcode
+        }))
+        if (deviceList.value.length) {
+          currentVideo.value = deviceList.value[0].name
+          // 默认播放第一路视频 (先获取设备id再根据id拿视频)
+          playerVideo(deviceList.value[0].devcode)
+        }
+      })
     })
-
-
-  }).catch(() => {
-    loading.value = false
-  })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -213,8 +223,8 @@
   $router.push({
     path: '/station/detail',
     query: {
-      id: detailInfo.value.id,
-    },
+      id: detailInfo.value.id
+    }
   })
   close()
 }
@@ -246,104 +256,267 @@
     getVideoUrl({
       deviceId: currentDeviceId.value,
       streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
-        return
-      }
-
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
-  }
-  else if (type === 'playback') {
+      .then(res => {
+        const videoUrl = res.data
+        if (!videoUrl) {
+          ElMessage('视频地址为空，无法播放')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+
+        // 播放视频
+        unref(playRef).playerFun.createPlayer(videoUrl, 1)
+      })
+      .catch(() => {
+        ElMessage.warning('获取设备视频失败')
+        unref(playRef).playerFun.stopAllPlay()
+      })
+  } else if (type === 'playback') {
     unref(playRef).playerFun.stopAllPlay()
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
       endDate: endTime
-    }).then(res => {
-      if (!res.data) {
-        ElMessage.warning('回放地址为空')
-        return
-      }
-      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
-    }).catch(() => {
-      ElMessage.warning('获取回放地址失败')
     })
+      .then(res => {
+        if (!res.data) {
+          ElMessage.warning('回放地址为空')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+        // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    //     const startTime = dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    // const endTime = dayjs(getFullTime()).add(2, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        unref(playRef).playerFun.replayFun({
+          url: res.data,
+          startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        })
+      })
+      .catch(() => {
+        ElMessage.warning('获取回放地址失败')
+         unref(playRef).playerFun.stopAllPlay()
+      })
   }
 }
 // const url = ref('')
 // const testVideo = () => {
 //   unref(playRef).playerFun.createPlayer(url.value, 1)
 // }
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
   <div class="dialog">
-    <el-dialog v-model="dialogFormVisible" append-to-body class="dialog" custom-class="dialog" :show-close="false"
-      width="950px" style="background-color: transparent;box-shadow: none;">
-      <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <el-dialog
+      v-model="dialogFormVisible"
+      append-to-body
+      class="dialog"
+      custom-class="dialog"
+      :show-close="false"
+      width="950px"
+      style="background-color: transparent; box-shadow: none"
+    >
+      <div
+        v-show="dialogFormVisible"
+        class="container clearfix"
+        @mouseleave="() => {}"
+      >
         <div class="header">
-          <div style="display: flex;align-items: center;">
-            <el-tooltip class="box-item" effect="dark" :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
-              placement="top">
-              <span class="title">{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span>
+          <div style="display: flex; align-items: center">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
+              placement="top"
+            >
+              <span class="title"
+                >{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span
+              >
             </el-tooltip>
-            <el-button size="small" style="margin-left: 10px;" @click="goDetail">
+            <el-button size="small" style="margin-left: 10px" @click="goDetail">
               详情
             </el-button>
           </div>
           <span class="close1" @click="close">×</span>
         </div>
         <!-- 云台视频 -->
-        <div v-if="deviceList.length" class="video">
+        <div v-if="deviceList.length" class="video" :style="{height: `${videoType === 'playback'? 370 : 290}px`}">
           <div class="video-menu">
-            <div v-for="item in deviceList" :key="item" class="menu-item"
-              :class="item.name === currentVideo ? 'active' : ''" @click="changeVideo(item)">
+            <div
+              v-for="item in deviceList"
+              :key="item"
+              class="menu-item"
+              :class="item.name === currentVideo ? 'active' : ''"
+              @click="changeVideo(item)"
+            >
               {{ item.name }}
             </div>
           </div>
           <div class="video-container">
             <div class="video-control">
-              <div style="width: 50%;display: flex;justify-content: center;">
-                <el-button :type="videoType === 'real' ? 'primary' : ''" round size="small" @click="handler('real')">
+              <div style="width: 50%; display: flex; justify-content: center">
+                <el-button
+                  :type="videoType === 'real' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handler('real')"
+                >
                   预览
                 </el-button>
-                <el-button :type="videoType === 'playback' ? 'primary' : ''" round size="small"
-                  @click="handler('playback')">
+                <el-button
+                  :type="videoType === 'playback' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handleTimeChange"
+                >
                   回放
                 </el-button>
-                <el-button round size="small">
-                  报警
-                </el-button>
+                <el-button round size="small"> 报警 </el-button>
                 <!-- <el-button round size="small" @click="testVideo" >
                   测试播放
                 </el-button>
                 <el-input v-model="url" style="width: 1000px;height: 30px;" clearable></el-input> -->
               </div>
             </div>
-            <div class="video-player" style="width: 710px;height: 250px;">
+            <div class="video-player" style="width: 710px; height: 250px">
               <!-- <video src="" autoplay muted controls /> -->
-              <player v-if="dialogFormVisible" ref="playRef" @error="playerError" :iWidth="710" :iHeight="250" />
+              <player
+                v-if="dialogFormVisible"
+                ref="playRef"
+                @error="playerError"
+                :iWidth="710"
+                :iHeight="250"
+              />
             </div>
+              <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
           </div>
         </div>
         <div class="body">
           <div class="descriptions" v-loading="loading">
-            <div v-for="(item, index) in descriptionsList" :key="item.text"
-              :style="{ width: index % 2 === 0 ? '65%' : '32%' }" class="descriptions-item">
+            <div
+              v-for="(item, index) in descriptionsList"
+              :key="item.text"
+              :style="{ width: index % 2 === 0 ? '65%' : '32%' }"
+              class="descriptions-item"
+            >
               <div :class="index % 2 === 0 ? 'label' : 'label1'">
                 {{ item.text }}
               </div>
-              <div v-if="item.text !== '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'"
-                :title="detailInfo[item.value] || ''">
+              <div
+                v-if="item.text !== '当前浓度'"
+                :class="index % 2 === 0 ? 'value' : 'value1'"
+                :title="detailInfo[item.value] || ''"
+              >
                 {{ detailInfo[item.value] || '' }}
               </div>
               <!-- <div v-if="item.text === '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'">
@@ -354,6 +527,7 @@
               </div> -->
             </div>
           </div>
+          
         </div>
       </div>
     </el-dialog>
@@ -361,6 +535,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container {
   width: 100%;
   background: #fff;
@@ -370,7 +556,6 @@
   overflow: hidden;
   box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
-
   .header {
     float: right;
     background-color: #0d76d4;
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 0bd414d..2294a5f 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -89,6 +89,7 @@
   // }
   if (!currentDeviceId.value) {
     ElMessage.warning('设备ID为空')
+    unref(playRef).playerFun.stopAllPlay()
     return
   }
   unref(playRef).playerFun.stopAllPlay()
@@ -102,17 +103,19 @@
       const videoUrl = res.data
       if (!videoUrl) {
         ElMessage('视频地址为空，无法播放')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
     }).catch(() => {
       ElMessage.warning('获取设备视频失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
   else if (type === 'playback') {
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
@@ -120,12 +123,14 @@
     }).then(res => {
       if (!res.data) {
         ElMessage.warning('回放地址为空')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
     }).catch(() => {
       ElMessage.warning('获取回放地址失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
 }
@@ -152,6 +157,88 @@
   resizePage()
 })
 const { proxy } = getCurrentInstance() as any
+
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
@@ -164,7 +251,7 @@
           <el-button :type="videoType === 'real' ? 'primary' : ''" round @click="handler('real')">
             预览
           </el-button>
-          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handler('playback')">
+          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handleTimeChange">
             回放
           </el-button>
         </div>
@@ -176,7 +263,34 @@
       </div>
       <!-- 云台控制按钮 -->
       <div>
-        <div class="control-btn">
+        <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;margin-top: 10px;margin-bottom: 15px;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
+        <div class="control-btn" v-if="videoType === 'real'">
           <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
@@ -189,6 +303,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container-station {
   width: 100%;
   display: flex;
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 5d32d49..3734639 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -122,15 +122,21 @@
   rowData.value = e.info.row
   loading.value = true
   gasData.value = []
+  //  ||
+    // rowData.value.deviceTypeName?.includes('智能警示桩')
   if (
     rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName?.includes('管网哨兵') ||
-    rowData.value.deviceTypeName?.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('管网哨兵')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+  //   descriptionsList.value.push({
+  //   text: '监控状态',
+  //   value: 'monitorStateName',
+  //   align: 'center'
+  // })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -152,7 +158,8 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName?.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') )) {
         return
       }
       if(res.data.installDate) {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 6b8d668..6bff419 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -107,8 +107,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -138,13 +138,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 4eb8c05..dbcf2f1 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -69,15 +69,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -442,8 +442,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -454,7 +454,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index c98a38f..a6c7d24 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -8,7 +8,11 @@
 import player from '@/components/HKplayer/index.vue'
 import { ElMessage } from 'element-plus'
 import { getDeviceById } from '@/api/home/well/well'
-import { getDeviceID, getVideoUrl, getVideoBackUrl } from '@/api/home/station/video'
+import {
+  getDeviceID,
+  getVideoUrl,
+  getVideoBackUrl
+} from '@/api/home/station/video'
 import dayjs from 'dayjs'
 const dialogFormVisible = ref(false)
 const $route = useRoute()
@@ -20,7 +24,7 @@
   ledgerName: '', // 场站名称
   lngGaode: '',
   latGaode: '',
-  tagNumber: '',
+  tagNumber: ''
 })
 const resizePage = () => {
   setTimeout(() => {
@@ -31,7 +35,7 @@
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
 
-const videoType = ref('real')  // 视频类型   实时real和回放playback
+const videoType = ref('real') // 视频类型   实时real和回放playback
 // 详细信息
 const detailInfo = ref<{ [key: string]: string }>({})
 // 描述列表数据
@@ -39,39 +43,39 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '场站状态',
     value: 'onStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
 
   {
     text: '负责人',
     value: 'personName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '标签',
     value: 'marker',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
     value: 'monitorStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '当前浓度',
   //   value: '',
@@ -125,7 +129,6 @@
   //   value: 'latGaode',
   //   align: 'center',
   // },
-
 ])
 const currentDeviceId = ref('')
 const playerVideo = (devcode: string) => {
@@ -134,31 +137,35 @@
     return
   }
   // unref(playRef).playerFun.createPlayer('ws://172.17.240.101:559/media?version=0.1&ciphersuites=0&sessionID', 1)
-  getDeviceID(devcode).then(res => {
-    const deviceId = res.data
-    if (!deviceId) {
-      ElMessage('设备ID为空，无法获取视频')
-      return
-    }
-    currentDeviceId.value = deviceId
-    getVideoUrl({
-      deviceId: deviceId,
-      streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
+  getDeviceID(devcode)
+    .then(res => {
+      const deviceId = res.data
+      if (!deviceId) {
+        ElMessage('设备ID为空，无法获取视频')
         return
       }
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
+      currentDeviceId.value = deviceId
+      getVideoUrl({
+        deviceId: deviceId,
+        streamType: '0'
+      })
+        .then(res => {
+          const videoUrl = res.data
+          if (!videoUrl) {
+            ElMessage('视频地址为空，无法播放')
+            return
+          }
+          // 播放视频
+          unref(playRef).playerFun.createPlayer(videoUrl, 1)
+        })
+        .catch(() => {
+          ElMessage.warning('获取设备视频失败')
+        })
     })
-  }).catch(() => {
-    currentDeviceId.value = ''
-    ElMessage.warning('获取设备ID失败')
-  })
+    .catch(() => {
+      currentDeviceId.value = ''
+      ElMessage.warning('获取设备ID失败')
+    })
 }
 // 初始化
 const playRef = ref()
@@ -175,32 +182,35 @@
   resizePage()
   // 获取详细信息
   loading.value = true
-  getWellDetail(e.info.id).then((res) => {
-    detailInfo.value = res.data
-    loading.value = false
-    if (res.data.personName && res.data.telephone) {
-      detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
-    }
-    // 处理监控状态
-    if (detailInfo.value.monitorStateName === '离线' && !$route.path.includes('station')) {
-      detailInfo.value.monitorStateName = '故障(离线)'
-    }
-    getDeviceById(e.info.id).then(res => {
-      deviceList.value = res.data.map((item: any) => ({
-        name: `${item.devcode}`,
-        devcode: item.devcode,
-      }))
-      if (deviceList.value.length) {
-        currentVideo.value = deviceList.value[0].name
-        // 默认播放第一路视频 (先获取设备id再根据id拿视频)
-        playerVideo(deviceList.value[0].devcode)
+  getWellDetail(e.info.id)
+    .then(res => {
+      detailInfo.value = res.data
+      loading.value = false
+      if (res.data.personName && res.data.telephone) {
+        detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
       }
+      // 处理监控状态
+      if (
+        detailInfo.value.monitorStateName === '离线' &&
+        !$route.path.includes('station')
+      ) {
+        detailInfo.value.monitorStateName = '故障(离线)'
+      }
+      getDeviceById(e.info.id).then(res => {
+        deviceList.value = res.data.map((item: any) => ({
+          name: `${item.devcode}`,
+          devcode: item.devcode
+        }))
+        if (deviceList.value.length) {
+          currentVideo.value = deviceList.value[0].name
+          // 默认播放第一路视频 (先获取设备id再根据id拿视频)
+          playerVideo(deviceList.value[0].devcode)
+        }
+      })
     })
-
-
-  }).catch(() => {
-    loading.value = false
-  })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -213,8 +223,8 @@
   $router.push({
     path: '/station/detail',
     query: {
-      id: detailInfo.value.id,
-    },
+      id: detailInfo.value.id
+    }
   })
   close()
 }
@@ -246,104 +256,267 @@
     getVideoUrl({
       deviceId: currentDeviceId.value,
       streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
-        return
-      }
-
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
-  }
-  else if (type === 'playback') {
+      .then(res => {
+        const videoUrl = res.data
+        if (!videoUrl) {
+          ElMessage('视频地址为空，无法播放')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+
+        // 播放视频
+        unref(playRef).playerFun.createPlayer(videoUrl, 1)
+      })
+      .catch(() => {
+        ElMessage.warning('获取设备视频失败')
+        unref(playRef).playerFun.stopAllPlay()
+      })
+  } else if (type === 'playback') {
     unref(playRef).playerFun.stopAllPlay()
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
       endDate: endTime
-    }).then(res => {
-      if (!res.data) {
-        ElMessage.warning('回放地址为空')
-        return
-      }
-      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
-    }).catch(() => {
-      ElMessage.warning('获取回放地址失败')
     })
+      .then(res => {
+        if (!res.data) {
+          ElMessage.warning('回放地址为空')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+        // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    //     const startTime = dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    // const endTime = dayjs(getFullTime()).add(2, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        unref(playRef).playerFun.replayFun({
+          url: res.data,
+          startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        })
+      })
+      .catch(() => {
+        ElMessage.warning('获取回放地址失败')
+         unref(playRef).playerFun.stopAllPlay()
+      })
   }
 }
 // const url = ref('')
 // const testVideo = () => {
 //   unref(playRef).playerFun.createPlayer(url.value, 1)
 // }
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
   <div class="dialog">
-    <el-dialog v-model="dialogFormVisible" append-to-body class="dialog" custom-class="dialog" :show-close="false"
-      width="950px" style="background-color: transparent;box-shadow: none;">
-      <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <el-dialog
+      v-model="dialogFormVisible"
+      append-to-body
+      class="dialog"
+      custom-class="dialog"
+      :show-close="false"
+      width="950px"
+      style="background-color: transparent; box-shadow: none"
+    >
+      <div
+        v-show="dialogFormVisible"
+        class="container clearfix"
+        @mouseleave="() => {}"
+      >
         <div class="header">
-          <div style="display: flex;align-items: center;">
-            <el-tooltip class="box-item" effect="dark" :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
-              placement="top">
-              <span class="title">{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span>
+          <div style="display: flex; align-items: center">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
+              placement="top"
+            >
+              <span class="title"
+                >{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span
+              >
             </el-tooltip>
-            <el-button size="small" style="margin-left: 10px;" @click="goDetail">
+            <el-button size="small" style="margin-left: 10px" @click="goDetail">
               详情
             </el-button>
           </div>
           <span class="close1" @click="close">×</span>
         </div>
         <!-- 云台视频 -->
-        <div v-if="deviceList.length" class="video">
+        <div v-if="deviceList.length" class="video" :style="{height: `${videoType === 'playback'? 370 : 290}px`}">
           <div class="video-menu">
-            <div v-for="item in deviceList" :key="item" class="menu-item"
-              :class="item.name === currentVideo ? 'active' : ''" @click="changeVideo(item)">
+            <div
+              v-for="item in deviceList"
+              :key="item"
+              class="menu-item"
+              :class="item.name === currentVideo ? 'active' : ''"
+              @click="changeVideo(item)"
+            >
               {{ item.name }}
             </div>
           </div>
           <div class="video-container">
             <div class="video-control">
-              <div style="width: 50%;display: flex;justify-content: center;">
-                <el-button :type="videoType === 'real' ? 'primary' : ''" round size="small" @click="handler('real')">
+              <div style="width: 50%; display: flex; justify-content: center">
+                <el-button
+                  :type="videoType === 'real' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handler('real')"
+                >
                   预览
                 </el-button>
-                <el-button :type="videoType === 'playback' ? 'primary' : ''" round size="small"
-                  @click="handler('playback')">
+                <el-button
+                  :type="videoType === 'playback' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handleTimeChange"
+                >
                   回放
                 </el-button>
-                <el-button round size="small">
-                  报警
-                </el-button>
+                <el-button round size="small"> 报警 </el-button>
                 <!-- <el-button round size="small" @click="testVideo" >
                   测试播放
                 </el-button>
                 <el-input v-model="url" style="width: 1000px;height: 30px;" clearable></el-input> -->
               </div>
             </div>
-            <div class="video-player" style="width: 710px;height: 250px;">
+            <div class="video-player" style="width: 710px; height: 250px">
               <!-- <video src="" autoplay muted controls /> -->
-              <player v-if="dialogFormVisible" ref="playRef" @error="playerError" :iWidth="710" :iHeight="250" />
+              <player
+                v-if="dialogFormVisible"
+                ref="playRef"
+                @error="playerError"
+                :iWidth="710"
+                :iHeight="250"
+              />
             </div>
+              <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
           </div>
         </div>
         <div class="body">
           <div class="descriptions" v-loading="loading">
-            <div v-for="(item, index) in descriptionsList" :key="item.text"
-              :style="{ width: index % 2 === 0 ? '65%' : '32%' }" class="descriptions-item">
+            <div
+              v-for="(item, index) in descriptionsList"
+              :key="item.text"
+              :style="{ width: index % 2 === 0 ? '65%' : '32%' }"
+              class="descriptions-item"
+            >
               <div :class="index % 2 === 0 ? 'label' : 'label1'">
                 {{ item.text }}
               </div>
-              <div v-if="item.text !== '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'"
-                :title="detailInfo[item.value] || ''">
+              <div
+                v-if="item.text !== '当前浓度'"
+                :class="index % 2 === 0 ? 'value' : 'value1'"
+                :title="detailInfo[item.value] || ''"
+              >
                 {{ detailInfo[item.value] || '' }}
               </div>
               <!-- <div v-if="item.text === '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'">
@@ -354,6 +527,7 @@
               </div> -->
             </div>
           </div>
+          
         </div>
       </div>
     </el-dialog>
@@ -361,6 +535,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container {
   width: 100%;
   background: #fff;
@@ -370,7 +556,6 @@
   overflow: hidden;
   box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
-
   .header {
     float: right;
     background-color: #0d76d4;
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 0bd414d..2294a5f 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -89,6 +89,7 @@
   // }
   if (!currentDeviceId.value) {
     ElMessage.warning('设备ID为空')
+    unref(playRef).playerFun.stopAllPlay()
     return
   }
   unref(playRef).playerFun.stopAllPlay()
@@ -102,17 +103,19 @@
       const videoUrl = res.data
       if (!videoUrl) {
         ElMessage('视频地址为空，无法播放')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
     }).catch(() => {
       ElMessage.warning('获取设备视频失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
   else if (type === 'playback') {
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
@@ -120,12 +123,14 @@
     }).then(res => {
       if (!res.data) {
         ElMessage.warning('回放地址为空')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
     }).catch(() => {
       ElMessage.warning('获取回放地址失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
 }
@@ -152,6 +157,88 @@
   resizePage()
 })
 const { proxy } = getCurrentInstance() as any
+
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
@@ -164,7 +251,7 @@
           <el-button :type="videoType === 'real' ? 'primary' : ''" round @click="handler('real')">
             预览
           </el-button>
-          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handler('playback')">
+          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handleTimeChange">
             回放
           </el-button>
         </div>
@@ -176,7 +263,34 @@
       </div>
       <!-- 云台控制按钮 -->
       <div>
-        <div class="control-btn">
+        <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;margin-top: 10px;margin-bottom: 15px;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
+        <div class="control-btn" v-if="videoType === 'real'">
           <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
@@ -189,6 +303,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container-station {
   width: 100%;
   display: flex;
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 5d32d49..3734639 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -122,15 +122,21 @@
   rowData.value = e.info.row
   loading.value = true
   gasData.value = []
+  //  ||
+    // rowData.value.deviceTypeName?.includes('智能警示桩')
   if (
     rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName?.includes('管网哨兵') ||
-    rowData.value.deviceTypeName?.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('管网哨兵')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+  //   descriptionsList.value.push({
+  //   text: '监控状态',
+  //   value: 'monitorStateName',
+  //   align: 'center'
+  // })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -152,7 +158,8 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName?.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') )) {
         return
       }
       if(res.data.installDate) {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 6b8d668..6bff419 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -107,8 +107,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -138,13 +138,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index fe87be1..8160888 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,16 +145,16 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
-  { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
-  { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
+  { text: '采集时间', value: 'uptime', align: 'center', width: '' },
+  { text: '上传时间', value: 'logtime', align: 'center', width: '' }
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -565,8 +565,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -577,7 +577,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 4eb8c05..dbcf2f1 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -69,15 +69,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -442,8 +442,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -454,7 +454,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index c98a38f..a6c7d24 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -8,7 +8,11 @@
 import player from '@/components/HKplayer/index.vue'
 import { ElMessage } from 'element-plus'
 import { getDeviceById } from '@/api/home/well/well'
-import { getDeviceID, getVideoUrl, getVideoBackUrl } from '@/api/home/station/video'
+import {
+  getDeviceID,
+  getVideoUrl,
+  getVideoBackUrl
+} from '@/api/home/station/video'
 import dayjs from 'dayjs'
 const dialogFormVisible = ref(false)
 const $route = useRoute()
@@ -20,7 +24,7 @@
   ledgerName: '', // 场站名称
   lngGaode: '',
   latGaode: '',
-  tagNumber: '',
+  tagNumber: ''
 })
 const resizePage = () => {
   setTimeout(() => {
@@ -31,7 +35,7 @@
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
 
-const videoType = ref('real')  // 视频类型   实时real和回放playback
+const videoType = ref('real') // 视频类型   实时real和回放playback
 // 详细信息
 const detailInfo = ref<{ [key: string]: string }>({})
 // 描述列表数据
@@ -39,39 +43,39 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '场站状态',
     value: 'onStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
 
   {
     text: '负责人',
     value: 'personName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '标签',
     value: 'marker',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
     value: 'monitorStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '当前浓度',
   //   value: '',
@@ -125,7 +129,6 @@
   //   value: 'latGaode',
   //   align: 'center',
   // },
-
 ])
 const currentDeviceId = ref('')
 const playerVideo = (devcode: string) => {
@@ -134,31 +137,35 @@
     return
   }
   // unref(playRef).playerFun.createPlayer('ws://172.17.240.101:559/media?version=0.1&ciphersuites=0&sessionID', 1)
-  getDeviceID(devcode).then(res => {
-    const deviceId = res.data
-    if (!deviceId) {
-      ElMessage('设备ID为空，无法获取视频')
-      return
-    }
-    currentDeviceId.value = deviceId
-    getVideoUrl({
-      deviceId: deviceId,
-      streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
+  getDeviceID(devcode)
+    .then(res => {
+      const deviceId = res.data
+      if (!deviceId) {
+        ElMessage('设备ID为空，无法获取视频')
         return
       }
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
+      currentDeviceId.value = deviceId
+      getVideoUrl({
+        deviceId: deviceId,
+        streamType: '0'
+      })
+        .then(res => {
+          const videoUrl = res.data
+          if (!videoUrl) {
+            ElMessage('视频地址为空，无法播放')
+            return
+          }
+          // 播放视频
+          unref(playRef).playerFun.createPlayer(videoUrl, 1)
+        })
+        .catch(() => {
+          ElMessage.warning('获取设备视频失败')
+        })
     })
-  }).catch(() => {
-    currentDeviceId.value = ''
-    ElMessage.warning('获取设备ID失败')
-  })
+    .catch(() => {
+      currentDeviceId.value = ''
+      ElMessage.warning('获取设备ID失败')
+    })
 }
 // 初始化
 const playRef = ref()
@@ -175,32 +182,35 @@
   resizePage()
   // 获取详细信息
   loading.value = true
-  getWellDetail(e.info.id).then((res) => {
-    detailInfo.value = res.data
-    loading.value = false
-    if (res.data.personName && res.data.telephone) {
-      detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
-    }
-    // 处理监控状态
-    if (detailInfo.value.monitorStateName === '离线' && !$route.path.includes('station')) {
-      detailInfo.value.monitorStateName = '故障(离线)'
-    }
-    getDeviceById(e.info.id).then(res => {
-      deviceList.value = res.data.map((item: any) => ({
-        name: `${item.devcode}`,
-        devcode: item.devcode,
-      }))
-      if (deviceList.value.length) {
-        currentVideo.value = deviceList.value[0].name
-        // 默认播放第一路视频 (先获取设备id再根据id拿视频)
-        playerVideo(deviceList.value[0].devcode)
+  getWellDetail(e.info.id)
+    .then(res => {
+      detailInfo.value = res.data
+      loading.value = false
+      if (res.data.personName && res.data.telephone) {
+        detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
       }
+      // 处理监控状态
+      if (
+        detailInfo.value.monitorStateName === '离线' &&
+        !$route.path.includes('station')
+      ) {
+        detailInfo.value.monitorStateName = '故障(离线)'
+      }
+      getDeviceById(e.info.id).then(res => {
+        deviceList.value = res.data.map((item: any) => ({
+          name: `${item.devcode}`,
+          devcode: item.devcode
+        }))
+        if (deviceList.value.length) {
+          currentVideo.value = deviceList.value[0].name
+          // 默认播放第一路视频 (先获取设备id再根据id拿视频)
+          playerVideo(deviceList.value[0].devcode)
+        }
+      })
     })
-
-
-  }).catch(() => {
-    loading.value = false
-  })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -213,8 +223,8 @@
   $router.push({
     path: '/station/detail',
     query: {
-      id: detailInfo.value.id,
-    },
+      id: detailInfo.value.id
+    }
   })
   close()
 }
@@ -246,104 +256,267 @@
     getVideoUrl({
       deviceId: currentDeviceId.value,
       streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
-        return
-      }
-
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
-  }
-  else if (type === 'playback') {
+      .then(res => {
+        const videoUrl = res.data
+        if (!videoUrl) {
+          ElMessage('视频地址为空，无法播放')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+
+        // 播放视频
+        unref(playRef).playerFun.createPlayer(videoUrl, 1)
+      })
+      .catch(() => {
+        ElMessage.warning('获取设备视频失败')
+        unref(playRef).playerFun.stopAllPlay()
+      })
+  } else if (type === 'playback') {
     unref(playRef).playerFun.stopAllPlay()
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
       endDate: endTime
-    }).then(res => {
-      if (!res.data) {
-        ElMessage.warning('回放地址为空')
-        return
-      }
-      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
-    }).catch(() => {
-      ElMessage.warning('获取回放地址失败')
     })
+      .then(res => {
+        if (!res.data) {
+          ElMessage.warning('回放地址为空')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+        // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    //     const startTime = dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    // const endTime = dayjs(getFullTime()).add(2, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        unref(playRef).playerFun.replayFun({
+          url: res.data,
+          startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        })
+      })
+      .catch(() => {
+        ElMessage.warning('获取回放地址失败')
+         unref(playRef).playerFun.stopAllPlay()
+      })
   }
 }
 // const url = ref('')
 // const testVideo = () => {
 //   unref(playRef).playerFun.createPlayer(url.value, 1)
 // }
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
   <div class="dialog">
-    <el-dialog v-model="dialogFormVisible" append-to-body class="dialog" custom-class="dialog" :show-close="false"
-      width="950px" style="background-color: transparent;box-shadow: none;">
-      <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <el-dialog
+      v-model="dialogFormVisible"
+      append-to-body
+      class="dialog"
+      custom-class="dialog"
+      :show-close="false"
+      width="950px"
+      style="background-color: transparent; box-shadow: none"
+    >
+      <div
+        v-show="dialogFormVisible"
+        class="container clearfix"
+        @mouseleave="() => {}"
+      >
         <div class="header">
-          <div style="display: flex;align-items: center;">
-            <el-tooltip class="box-item" effect="dark" :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
-              placement="top">
-              <span class="title">{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span>
+          <div style="display: flex; align-items: center">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
+              placement="top"
+            >
+              <span class="title"
+                >{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span
+              >
             </el-tooltip>
-            <el-button size="small" style="margin-left: 10px;" @click="goDetail">
+            <el-button size="small" style="margin-left: 10px" @click="goDetail">
               详情
             </el-button>
           </div>
           <span class="close1" @click="close">×</span>
         </div>
         <!-- 云台视频 -->
-        <div v-if="deviceList.length" class="video">
+        <div v-if="deviceList.length" class="video" :style="{height: `${videoType === 'playback'? 370 : 290}px`}">
           <div class="video-menu">
-            <div v-for="item in deviceList" :key="item" class="menu-item"
-              :class="item.name === currentVideo ? 'active' : ''" @click="changeVideo(item)">
+            <div
+              v-for="item in deviceList"
+              :key="item"
+              class="menu-item"
+              :class="item.name === currentVideo ? 'active' : ''"
+              @click="changeVideo(item)"
+            >
               {{ item.name }}
             </div>
           </div>
           <div class="video-container">
             <div class="video-control">
-              <div style="width: 50%;display: flex;justify-content: center;">
-                <el-button :type="videoType === 'real' ? 'primary' : ''" round size="small" @click="handler('real')">
+              <div style="width: 50%; display: flex; justify-content: center">
+                <el-button
+                  :type="videoType === 'real' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handler('real')"
+                >
                   预览
                 </el-button>
-                <el-button :type="videoType === 'playback' ? 'primary' : ''" round size="small"
-                  @click="handler('playback')">
+                <el-button
+                  :type="videoType === 'playback' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handleTimeChange"
+                >
                   回放
                 </el-button>
-                <el-button round size="small">
-                  报警
-                </el-button>
+                <el-button round size="small"> 报警 </el-button>
                 <!-- <el-button round size="small" @click="testVideo" >
                   测试播放
                 </el-button>
                 <el-input v-model="url" style="width: 1000px;height: 30px;" clearable></el-input> -->
               </div>
             </div>
-            <div class="video-player" style="width: 710px;height: 250px;">
+            <div class="video-player" style="width: 710px; height: 250px">
               <!-- <video src="" autoplay muted controls /> -->
-              <player v-if="dialogFormVisible" ref="playRef" @error="playerError" :iWidth="710" :iHeight="250" />
+              <player
+                v-if="dialogFormVisible"
+                ref="playRef"
+                @error="playerError"
+                :iWidth="710"
+                :iHeight="250"
+              />
             </div>
+              <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
           </div>
         </div>
         <div class="body">
           <div class="descriptions" v-loading="loading">
-            <div v-for="(item, index) in descriptionsList" :key="item.text"
-              :style="{ width: index % 2 === 0 ? '65%' : '32%' }" class="descriptions-item">
+            <div
+              v-for="(item, index) in descriptionsList"
+              :key="item.text"
+              :style="{ width: index % 2 === 0 ? '65%' : '32%' }"
+              class="descriptions-item"
+            >
               <div :class="index % 2 === 0 ? 'label' : 'label1'">
                 {{ item.text }}
               </div>
-              <div v-if="item.text !== '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'"
-                :title="detailInfo[item.value] || ''">
+              <div
+                v-if="item.text !== '当前浓度'"
+                :class="index % 2 === 0 ? 'value' : 'value1'"
+                :title="detailInfo[item.value] || ''"
+              >
                 {{ detailInfo[item.value] || '' }}
               </div>
               <!-- <div v-if="item.text === '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'">
@@ -354,6 +527,7 @@
               </div> -->
             </div>
           </div>
+          
         </div>
       </div>
     </el-dialog>
@@ -361,6 +535,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container {
   width: 100%;
   background: #fff;
@@ -370,7 +556,6 @@
   overflow: hidden;
   box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
-
   .header {
     float: right;
     background-color: #0d76d4;
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 0bd414d..2294a5f 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -89,6 +89,7 @@
   // }
   if (!currentDeviceId.value) {
     ElMessage.warning('设备ID为空')
+    unref(playRef).playerFun.stopAllPlay()
     return
   }
   unref(playRef).playerFun.stopAllPlay()
@@ -102,17 +103,19 @@
       const videoUrl = res.data
       if (!videoUrl) {
         ElMessage('视频地址为空，无法播放')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
     }).catch(() => {
       ElMessage.warning('获取设备视频失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
   else if (type === 'playback') {
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
@@ -120,12 +123,14 @@
     }).then(res => {
       if (!res.data) {
         ElMessage.warning('回放地址为空')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
     }).catch(() => {
       ElMessage.warning('获取回放地址失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
 }
@@ -152,6 +157,88 @@
   resizePage()
 })
 const { proxy } = getCurrentInstance() as any
+
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
@@ -164,7 +251,7 @@
           <el-button :type="videoType === 'real' ? 'primary' : ''" round @click="handler('real')">
             预览
           </el-button>
-          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handler('playback')">
+          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handleTimeChange">
             回放
           </el-button>
         </div>
@@ -176,7 +263,34 @@
       </div>
       <!-- 云台控制按钮 -->
       <div>
-        <div class="control-btn">
+        <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;margin-top: 10px;margin-bottom: 15px;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
+        <div class="control-btn" v-if="videoType === 'real'">
           <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
@@ -189,6 +303,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container-station {
   width: 100%;
   display: flex;
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 5d32d49..3734639 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -122,15 +122,21 @@
   rowData.value = e.info.row
   loading.value = true
   gasData.value = []
+  //  ||
+    // rowData.value.deviceTypeName?.includes('智能警示桩')
   if (
     rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName?.includes('管网哨兵') ||
-    rowData.value.deviceTypeName?.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('管网哨兵')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+  //   descriptionsList.value.push({
+  //   text: '监控状态',
+  //   value: 'monitorStateName',
+  //   align: 'center'
+  // })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -152,7 +158,8 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName?.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') )) {
         return
       }
       if(res.data.installDate) {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 6b8d668..6bff419 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -107,8 +107,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -138,13 +138,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index fe87be1..8160888 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,16 +145,16 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
-  { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
-  { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
+  { text: '采集时间', value: 'uptime', align: 'center', width: '' },
+  { text: '上传时间', value: 'logtime', align: 'center', width: '' }
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -565,8 +565,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -577,7 +577,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 9c267b1..3d65097 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -87,15 +87,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -562,8 +562,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -574,7 +574,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 4eb8c05..dbcf2f1 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -69,15 +69,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -442,8 +442,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -454,7 +454,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index c98a38f..a6c7d24 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -8,7 +8,11 @@
 import player from '@/components/HKplayer/index.vue'
 import { ElMessage } from 'element-plus'
 import { getDeviceById } from '@/api/home/well/well'
-import { getDeviceID, getVideoUrl, getVideoBackUrl } from '@/api/home/station/video'
+import {
+  getDeviceID,
+  getVideoUrl,
+  getVideoBackUrl
+} from '@/api/home/station/video'
 import dayjs from 'dayjs'
 const dialogFormVisible = ref(false)
 const $route = useRoute()
@@ -20,7 +24,7 @@
   ledgerName: '', // 场站名称
   lngGaode: '',
   latGaode: '',
-  tagNumber: '',
+  tagNumber: ''
 })
 const resizePage = () => {
   setTimeout(() => {
@@ -31,7 +35,7 @@
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
 
-const videoType = ref('real')  // 视频类型   实时real和回放playback
+const videoType = ref('real') // 视频类型   实时real和回放playback
 // 详细信息
 const detailInfo = ref<{ [key: string]: string }>({})
 // 描述列表数据
@@ -39,39 +43,39 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '场站状态',
     value: 'onStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
 
   {
     text: '负责人',
     value: 'personName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '标签',
     value: 'marker',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
     value: 'monitorStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '当前浓度',
   //   value: '',
@@ -125,7 +129,6 @@
   //   value: 'latGaode',
   //   align: 'center',
   // },
-
 ])
 const currentDeviceId = ref('')
 const playerVideo = (devcode: string) => {
@@ -134,31 +137,35 @@
     return
   }
   // unref(playRef).playerFun.createPlayer('ws://172.17.240.101:559/media?version=0.1&ciphersuites=0&sessionID', 1)
-  getDeviceID(devcode).then(res => {
-    const deviceId = res.data
-    if (!deviceId) {
-      ElMessage('设备ID为空，无法获取视频')
-      return
-    }
-    currentDeviceId.value = deviceId
-    getVideoUrl({
-      deviceId: deviceId,
-      streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
+  getDeviceID(devcode)
+    .then(res => {
+      const deviceId = res.data
+      if (!deviceId) {
+        ElMessage('设备ID为空，无法获取视频')
         return
       }
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
+      currentDeviceId.value = deviceId
+      getVideoUrl({
+        deviceId: deviceId,
+        streamType: '0'
+      })
+        .then(res => {
+          const videoUrl = res.data
+          if (!videoUrl) {
+            ElMessage('视频地址为空，无法播放')
+            return
+          }
+          // 播放视频
+          unref(playRef).playerFun.createPlayer(videoUrl, 1)
+        })
+        .catch(() => {
+          ElMessage.warning('获取设备视频失败')
+        })
     })
-  }).catch(() => {
-    currentDeviceId.value = ''
-    ElMessage.warning('获取设备ID失败')
-  })
+    .catch(() => {
+      currentDeviceId.value = ''
+      ElMessage.warning('获取设备ID失败')
+    })
 }
 // 初始化
 const playRef = ref()
@@ -175,32 +182,35 @@
   resizePage()
   // 获取详细信息
   loading.value = true
-  getWellDetail(e.info.id).then((res) => {
-    detailInfo.value = res.data
-    loading.value = false
-    if (res.data.personName && res.data.telephone) {
-      detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
-    }
-    // 处理监控状态
-    if (detailInfo.value.monitorStateName === '离线' && !$route.path.includes('station')) {
-      detailInfo.value.monitorStateName = '故障(离线)'
-    }
-    getDeviceById(e.info.id).then(res => {
-      deviceList.value = res.data.map((item: any) => ({
-        name: `${item.devcode}`,
-        devcode: item.devcode,
-      }))
-      if (deviceList.value.length) {
-        currentVideo.value = deviceList.value[0].name
-        // 默认播放第一路视频 (先获取设备id再根据id拿视频)
-        playerVideo(deviceList.value[0].devcode)
+  getWellDetail(e.info.id)
+    .then(res => {
+      detailInfo.value = res.data
+      loading.value = false
+      if (res.data.personName && res.data.telephone) {
+        detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
       }
+      // 处理监控状态
+      if (
+        detailInfo.value.monitorStateName === '离线' &&
+        !$route.path.includes('station')
+      ) {
+        detailInfo.value.monitorStateName = '故障(离线)'
+      }
+      getDeviceById(e.info.id).then(res => {
+        deviceList.value = res.data.map((item: any) => ({
+          name: `${item.devcode}`,
+          devcode: item.devcode
+        }))
+        if (deviceList.value.length) {
+          currentVideo.value = deviceList.value[0].name
+          // 默认播放第一路视频 (先获取设备id再根据id拿视频)
+          playerVideo(deviceList.value[0].devcode)
+        }
+      })
     })
-
-
-  }).catch(() => {
-    loading.value = false
-  })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -213,8 +223,8 @@
   $router.push({
     path: '/station/detail',
     query: {
-      id: detailInfo.value.id,
-    },
+      id: detailInfo.value.id
+    }
   })
   close()
 }
@@ -246,104 +256,267 @@
     getVideoUrl({
       deviceId: currentDeviceId.value,
       streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
-        return
-      }
-
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
-  }
-  else if (type === 'playback') {
+      .then(res => {
+        const videoUrl = res.data
+        if (!videoUrl) {
+          ElMessage('视频地址为空，无法播放')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+
+        // 播放视频
+        unref(playRef).playerFun.createPlayer(videoUrl, 1)
+      })
+      .catch(() => {
+        ElMessage.warning('获取设备视频失败')
+        unref(playRef).playerFun.stopAllPlay()
+      })
+  } else if (type === 'playback') {
     unref(playRef).playerFun.stopAllPlay()
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
       endDate: endTime
-    }).then(res => {
-      if (!res.data) {
-        ElMessage.warning('回放地址为空')
-        return
-      }
-      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
-    }).catch(() => {
-      ElMessage.warning('获取回放地址失败')
     })
+      .then(res => {
+        if (!res.data) {
+          ElMessage.warning('回放地址为空')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+        // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    //     const startTime = dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    // const endTime = dayjs(getFullTime()).add(2, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        unref(playRef).playerFun.replayFun({
+          url: res.data,
+          startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        })
+      })
+      .catch(() => {
+        ElMessage.warning('获取回放地址失败')
+         unref(playRef).playerFun.stopAllPlay()
+      })
   }
 }
 // const url = ref('')
 // const testVideo = () => {
 //   unref(playRef).playerFun.createPlayer(url.value, 1)
 // }
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
   <div class="dialog">
-    <el-dialog v-model="dialogFormVisible" append-to-body class="dialog" custom-class="dialog" :show-close="false"
-      width="950px" style="background-color: transparent;box-shadow: none;">
-      <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <el-dialog
+      v-model="dialogFormVisible"
+      append-to-body
+      class="dialog"
+      custom-class="dialog"
+      :show-close="false"
+      width="950px"
+      style="background-color: transparent; box-shadow: none"
+    >
+      <div
+        v-show="dialogFormVisible"
+        class="container clearfix"
+        @mouseleave="() => {}"
+      >
         <div class="header">
-          <div style="display: flex;align-items: center;">
-            <el-tooltip class="box-item" effect="dark" :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
-              placement="top">
-              <span class="title">{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span>
+          <div style="display: flex; align-items: center">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
+              placement="top"
+            >
+              <span class="title"
+                >{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span
+              >
             </el-tooltip>
-            <el-button size="small" style="margin-left: 10px;" @click="goDetail">
+            <el-button size="small" style="margin-left: 10px" @click="goDetail">
               详情
             </el-button>
           </div>
           <span class="close1" @click="close">×</span>
         </div>
         <!-- 云台视频 -->
-        <div v-if="deviceList.length" class="video">
+        <div v-if="deviceList.length" class="video" :style="{height: `${videoType === 'playback'? 370 : 290}px`}">
           <div class="video-menu">
-            <div v-for="item in deviceList" :key="item" class="menu-item"
-              :class="item.name === currentVideo ? 'active' : ''" @click="changeVideo(item)">
+            <div
+              v-for="item in deviceList"
+              :key="item"
+              class="menu-item"
+              :class="item.name === currentVideo ? 'active' : ''"
+              @click="changeVideo(item)"
+            >
               {{ item.name }}
             </div>
           </div>
           <div class="video-container">
             <div class="video-control">
-              <div style="width: 50%;display: flex;justify-content: center;">
-                <el-button :type="videoType === 'real' ? 'primary' : ''" round size="small" @click="handler('real')">
+              <div style="width: 50%; display: flex; justify-content: center">
+                <el-button
+                  :type="videoType === 'real' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handler('real')"
+                >
                   预览
                 </el-button>
-                <el-button :type="videoType === 'playback' ? 'primary' : ''" round size="small"
-                  @click="handler('playback')">
+                <el-button
+                  :type="videoType === 'playback' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handleTimeChange"
+                >
                   回放
                 </el-button>
-                <el-button round size="small">
-                  报警
-                </el-button>
+                <el-button round size="small"> 报警 </el-button>
                 <!-- <el-button round size="small" @click="testVideo" >
                   测试播放
                 </el-button>
                 <el-input v-model="url" style="width: 1000px;height: 30px;" clearable></el-input> -->
               </div>
             </div>
-            <div class="video-player" style="width: 710px;height: 250px;">
+            <div class="video-player" style="width: 710px; height: 250px">
               <!-- <video src="" autoplay muted controls /> -->
-              <player v-if="dialogFormVisible" ref="playRef" @error="playerError" :iWidth="710" :iHeight="250" />
+              <player
+                v-if="dialogFormVisible"
+                ref="playRef"
+                @error="playerError"
+                :iWidth="710"
+                :iHeight="250"
+              />
             </div>
+              <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
           </div>
         </div>
         <div class="body">
           <div class="descriptions" v-loading="loading">
-            <div v-for="(item, index) in descriptionsList" :key="item.text"
-              :style="{ width: index % 2 === 0 ? '65%' : '32%' }" class="descriptions-item">
+            <div
+              v-for="(item, index) in descriptionsList"
+              :key="item.text"
+              :style="{ width: index % 2 === 0 ? '65%' : '32%' }"
+              class="descriptions-item"
+            >
               <div :class="index % 2 === 0 ? 'label' : 'label1'">
                 {{ item.text }}
               </div>
-              <div v-if="item.text !== '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'"
-                :title="detailInfo[item.value] || ''">
+              <div
+                v-if="item.text !== '当前浓度'"
+                :class="index % 2 === 0 ? 'value' : 'value1'"
+                :title="detailInfo[item.value] || ''"
+              >
                 {{ detailInfo[item.value] || '' }}
               </div>
               <!-- <div v-if="item.text === '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'">
@@ -354,6 +527,7 @@
               </div> -->
             </div>
           </div>
+          
         </div>
       </div>
     </el-dialog>
@@ -361,6 +535,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container {
   width: 100%;
   background: #fff;
@@ -370,7 +556,6 @@
   overflow: hidden;
   box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
-
   .header {
     float: right;
     background-color: #0d76d4;
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 0bd414d..2294a5f 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -89,6 +89,7 @@
   // }
   if (!currentDeviceId.value) {
     ElMessage.warning('设备ID为空')
+    unref(playRef).playerFun.stopAllPlay()
     return
   }
   unref(playRef).playerFun.stopAllPlay()
@@ -102,17 +103,19 @@
       const videoUrl = res.data
       if (!videoUrl) {
         ElMessage('视频地址为空，无法播放')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
     }).catch(() => {
       ElMessage.warning('获取设备视频失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
   else if (type === 'playback') {
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
@@ -120,12 +123,14 @@
     }).then(res => {
       if (!res.data) {
         ElMessage.warning('回放地址为空')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
     }).catch(() => {
       ElMessage.warning('获取回放地址失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
 }
@@ -152,6 +157,88 @@
   resizePage()
 })
 const { proxy } = getCurrentInstance() as any
+
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
@@ -164,7 +251,7 @@
           <el-button :type="videoType === 'real' ? 'primary' : ''" round @click="handler('real')">
             预览
           </el-button>
-          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handler('playback')">
+          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handleTimeChange">
             回放
           </el-button>
         </div>
@@ -176,7 +263,34 @@
       </div>
       <!-- 云台控制按钮 -->
       <div>
-        <div class="control-btn">
+        <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;margin-top: 10px;margin-bottom: 15px;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
+        <div class="control-btn" v-if="videoType === 'real'">
           <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
@@ -189,6 +303,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container-station {
   width: 100%;
   display: flex;
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 5d32d49..3734639 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -122,15 +122,21 @@
   rowData.value = e.info.row
   loading.value = true
   gasData.value = []
+  //  ||
+    // rowData.value.deviceTypeName?.includes('智能警示桩')
   if (
     rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName?.includes('管网哨兵') ||
-    rowData.value.deviceTypeName?.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('管网哨兵')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+  //   descriptionsList.value.push({
+  //   text: '监控状态',
+  //   value: 'monitorStateName',
+  //   align: 'center'
+  // })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -152,7 +158,8 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName?.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') )) {
         return
       }
       if(res.data.installDate) {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 6b8d668..6bff419 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -107,8 +107,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -138,13 +138,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index fe87be1..8160888 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,16 +145,16 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
-  { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
-  { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
+  { text: '采集时间', value: 'uptime', align: 'center', width: '' },
+  { text: '上传时间', value: 'logtime', align: 'center', width: '' }
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -565,8 +565,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -577,7 +577,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 9c267b1..3d65097 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -87,15 +87,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -562,8 +562,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -574,7 +574,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/tool/index.vue b/src/views/home/tool/index.vue
index 9254c45..03833d1 100644
--- a/src/views/home/tool/index.vue
+++ b/src/views/home/tool/index.vue
@@ -37,7 +37,7 @@
 const menuX = ref(0)
 const menuY = ref(0)
 const completeMap = () => {
-  console.log('地图加载完成')
+  // console.log('地图加载完成')
   isComplete.value = true
   if (deviceList.value.length) {
     // 绘制点位
@@ -91,7 +91,7 @@
     offset: 1,
     limit: 9999
   }).then(res => {
-    console.log(res.data, '诺成新设备数据')
+    // console.log(res.data, '诺成新设备数据')
     deviceList.value = res.data.rows.filter(
       (item: any) => item.lat && item.lng && item.id && item.devcode
     )
@@ -137,10 +137,15 @@
   })
   mapRef.value.map.add([polyline])
   polyline.on('rightclick', e => {
+    if (loadingBtn.value) {
+      ElMessage.warning('数据正在保存中，请等待')
+      return
+    }
     if (polyEditor.value) {
       ElMessage.warning('正在编辑中，请先完成编辑')
       return
     }
+
     // 弹出菜单
     // 获取地图容器偏移量
     const containerRect = mapContainer.value.getBoundingClientRect()
@@ -181,6 +186,7 @@
           item.lngGd &&
           item.type
       )
+      // console.log(lineList.value, 'lineList.value')
       if (reset) {
         // 获取地图实例中的所有覆盖物
         const overlays = mapRef.value.map.getAllOverlays()
@@ -206,6 +212,10 @@
 
 // 点击设备点位
 const massMarksClick = (data: any) => {
+  if (loadingBtn.value) {
+    ElMessage.warning('数据正在保存中，请等待')
+    return
+  }
   if (polyEditor.value) {
     ElMessage.warning('正在编辑中，请先完成编辑')
     return
@@ -224,7 +234,7 @@
   const line = lineList.value.filter(
     (item: any) => item.deviceId === currentDevice.value
   )
-  if (line.length === 2) {
+  if (line.length >= 2) {
     currentDevice.value = ''
     currentCode.value = ''
     ElMessage.warning('该设备已有两条线段，请勿重复添加')
@@ -263,13 +273,13 @@
   polyEditor.value.close()
   currentLine.value.setMap(null)
   polyEditor.value = ''
-  console.log(handlerType.value, 'handlerType.value')
+  // console.log(handlerType.value, 'handlerType.value')
   if (handlerType.value === 'edit') {
     const line = lineList.value.find(
       (item: any) =>
         item.deviceId === currentDevice.value && item.type === item.type
     )
-    console.log(line)
+    // console.log(line)
     drawLine(line)
   }
   // 清空
@@ -297,6 +307,7 @@
 }
 
 // 保存线
+const loadingBtn = ref(false)
 const saveLine = () => {
   if (!currentDevice.value || !currentLine.value) {
     return
@@ -308,6 +319,14 @@
   }))
   // 判断是编辑还是新建
   if (handlerType.value === 'add') {
+    if (
+      lineList.value.filter(
+        (item: any) => item.deviceCode === currentCode.value
+      ).length >= 2
+    ) {
+      return
+    }
+    loadingBtn.value = true
     addNcxPosition({
       deviceCode: currentCode.value,
       deviceId: currentDevice.value,
@@ -317,6 +336,7 @@
       ts: dayjs().format('YYYY-MM-DD HH:mm:ss')
     })
       .then(() => {
+        loadingBtn.value = false
         ElMessage.success('保存成功')
         polyEditor.value.close()
         polyEditor.value = ''
@@ -329,6 +349,7 @@
         fetchLine(true)
       })
       .catch(() => {
+        loadingBtn.value = false
         polyEditor.value.close()
         polyEditor.value = ''
         currentLine.value.setMap(null)
@@ -339,6 +360,7 @@
         item.deviceId === currentDevice.value && item.type === item.type
     )
     if (line) {
+      loadingBtn.value = true
       editNcxPosition({
         ...line,
         latGd: path.map((item: any) => item.lat).join(),
@@ -346,6 +368,7 @@
         ts: dayjs().format('YYYY-MM-DD HH:mm:ss')
       })
         .then(res => {
+          loadingBtn.value = false
           ElMessage.success('保存成功')
           polyEditor.value.close()
           polyEditor.value = ''
@@ -358,6 +381,7 @@
           fetchLine(true)
         })
         .catch(() => {
+          loadingBtn.value = false
           polyEditor.value.close()
           polyEditor.value = ''
           currentLine.value.setMap(null)
@@ -389,10 +413,12 @@
             currentLine.value = ''
             lineType.value = ''
             handlerType.value = ''
-            lineList.value = lineList.value.filter(
-              (item: any) =>
-                item.deviceId === line.deviceId && item.type === line.type
-            )
+            // 重新获取线
+            fetchLine(true)
+            // lineList.value = lineList.value.filter(
+            //   (item: any) =>
+            //     item.deviceId === line.deviceId && item.type === line.type
+            // )
           })
           .catch(() => {
             handlerType.value = ''
@@ -481,12 +507,14 @@
     <div class="btn-container">
       <el-button
         type="primary"
-        :disabled="!currentDevice || menuVisible"
+        :disabled="!currentDevice || menuVisible || loadingBtn"
         @click="saveLine"
         >保存</el-button
       >
-      <el-button :disabled="!currentDevice || menuVisible" @click="cancelLine"
-        >{{ handlerType === 'edit' ? '取消' : '删除'}}</el-button
+      <el-button
+        :disabled="!currentDevice || menuVisible"
+        @click="cancelLine"
+        >{{ handlerType === 'edit' ? '取消' : '删除' }}</el-button
       >
       <el-tooltip placement="bottom">
         <template #content>

diff --git a/public/config/config.json b/public/config/config.json
index 1053b40..22f4711 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title":"感知数据汇聚平台",
-  "baseUrl": "http://10.30.7.26:20705",
+  "baseUrl": "http://111.198.10.15:11643",
   "securityJsCode": "56bf9671d4b3517d294caec4751889a1",
   "JsKey": "40849e82b4e33f5255b17372520c954d",
   "xuntengMap": "http://10.30.7.26:20705/getMap?mapPath=http://172.17.206.70:20198/_allLayer/tile",
diff --git a/src/components.d.ts b/src/components.d.ts
index 003b04b..e1cc6fe 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -74,6 +74,21 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    VanBackTop: typeof import('vant/es')['BackTop']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanDialog: typeof import('vant/es')['Dialog']
+    VanEmpty: typeof import('vant/es')['Empty']
+    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']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
     VirtualTable: typeof import('./components/VirtualTable/index.vue')['default']
   }
 }
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index cb6c5be..f2f20c5 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -196,6 +196,11 @@
 const stopAllPlay = () => {
   player.value.JS_StopRealPlayAll().then(() => {
     console.info('JS_StopRealPlayAll success')
+    if (document.getElementById("img")) {
+    document.querySelectorAll('[id="img"]').forEach(element => {
+      element.remove();
+    })
+  }
   })
 }
 const playerFun = {
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 1c5e45b..a69940b 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -674,7 +674,7 @@
           icon: 'ep:key',
           sidebar: true,
           breadcrumb: true,
-          activeMenu: '/device/tool',
+          activeMenu: '/operation/tool',
           auth: '/device/tool',
         },
       },
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index c022cf5..f688528 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -121,8 +121,8 @@
 // DATA_PAN_GAS("场站监测云台", "data_pan_gas", "DEVICE_CODE,,logtime", "ID,LEDGER_NUMBER,DEVICE_CODE设备编号,CONCENTRATION浓度,LOGTIME,DIRCETION水平位置,PITCH垂直位置", "LOGTIME采集时间");
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -332,14 +332,14 @@
         }
       } else if (listQuery.value.typeName === '智能警示桩') {
         data.value = [
-          {
-            name: '左侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
-          },
-          {
-            name: '右侧甲烷值',
-            data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
-          }
+          // {
+          //   name: '左侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0')
+          // },
+          // {
+          //   name: '右侧甲烷值',
+          //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0')
+          // }
         ]
       } else if (listQuery.value.typeName === '场站监测云台') {
         data.value = [
@@ -517,8 +517,8 @@
     columns3: {
       list: list.value.map((item:any, index:number) => ({
         '1index': index+ 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -529,7 +529,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index:number) => ({
@@ -579,7 +580,7 @@
           <el-button type="primary" style="margin-left: 10px" @click="fetchData">
             搜索
           </el-button>
-          <el-button style="margin-left: 10px" @click="changeView">
+          <el-button v-if="listQuery.typeName !== '智能警示桩'" style="margin-left: 10px" @click="changeView">
             切换视图
           </el-button>
           <el-button type="primary" style="margin-left: 10px" @click="exportList">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 1ab7842..1f71bca 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -111,8 +111,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
@@ -367,16 +367,16 @@
     }
     else if (listQuery.value.typeName === '智能警示桩') {
       chartData.value = [
-        {
-          name: '左侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
-        {
-          name: '右侧甲烷值',
-          data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
-          symbol: list.value.length > 1 ? 'none' : 'circle',
-        },
+        // {
+        //   name: '左侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.leftGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
+        // {
+        //   name: '右侧甲烷值',
+        //   data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.rightGas || '0'),
+        //   symbol: list.value.length > 1 ? 'none' : 'circle',
+        // },
       ]
     }
     else if (listQuery.value.typeName.includes('云台')) {
@@ -503,8 +503,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -515,7 +515,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
@@ -546,7 +547,7 @@
   <div>
     <search-area @search="fetchData">
       <template #middle-btns>
-        <el-button @click="changeView">
+        <el-button v-if="listQuery.typeName !== '智能警示桩'" @click="changeView">
           切换视图
         </el-button>
         <el-button v-if="proxy.hasPerm('/device/manage/export')" type="primary" @click="exportList">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 43a1f5b..328dcd0 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -55,7 +55,8 @@
   ],
   pipeCode: [
     { required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }
-  ]
+  ],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/device/device/components/localtionForWell.vue b/src/views/home/device/device/components/localtionForWell.vue
index c348409..a64b22b 100644
--- a/src/views/home/device/device/components/localtionForWell.vue
+++ b/src/views/home/device/device/components/localtionForWell.vue
@@ -48,6 +48,7 @@
   position: [{ required: true, message: '详细位置不能为空', trigger: ['blur', 'change'] }],
   deptid: [{ required: true, message: '管理单位不能为空', trigger: ['blur', 'change'] }],
   ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 const mapRef = ref() // 地图
 // 地图中心点
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index e5f0631..4d3e4f1 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -51,23 +51,23 @@
   'mhk03': '', // 设备采样周期 1- 30 分钟
   'mhk04': '', // 上传采样周期 1- 1440 分钟
   'mhk05': '', // GPS告警距离 1 - 65535 米
-  'mhk06': '1', // 确定设备安装位置 value = 1 生效
-  'mhk07': '1', // 清除安装位置 value = 1 生效
-  'mhk08': '1', // 重启设备 value = 1 生效
+  'mhk06': '', // 确定设备安装位置 value = 1 生效
+  'mhk07': '', // 清除安装位置 value = 1 生效
+  'mhk08': '', // 重启设备 value = 1 生效
 
   // 诺成新-燃气智能警示桩
   'ncx01': '', // 第一次上报时间 值，时分（整数）
   'ncx02': '', // 第二次上报时间 值，时分（整数）
   'ncx03': '', // 左侧线长度 值，单位米
   'ncx04': '', // 右侧线长度 值，单位米
-  'ncx05': '1', // 倾斜报警
-  'ncx06': '1', // 破坏报警
-  'ncx07': '1', // 甲烷泄漏报警
-  'ncx08': '1', // 左侧断线报警
-  'ncx09': '1', // 右侧断线报警
-  'ncx10': '1', // 左侧振动报警
-  'ncx11': '1', // 右侧振动报警
-  'ncx12': '1', // 语音报警
+  'ncx05': '', // 倾斜报警
+  'ncx06': '', // 破坏报警
+  'ncx07': '', // 甲烷泄漏报警
+  'ncx08': '', // 左侧断线报警
+  'ncx09': '', // 右侧断线报警
+  'ncx10': '', // 左侧振动报警
+  'ncx11': '', // 右侧振动报警
+  'ncx12': '', // 语音报警
   // 'ncx13': '1', // 备用
 
   // 百瑞生-管网哨兵
@@ -78,9 +78,9 @@
   'brs11': '', // 传感器采集间隔 值，单位秒
   'brs12': '', // 采样深度
   'brs15': '', // 预热时间 值，单位秒
-  'brs19': '1', // 防盗使能  1开启，0禁用
-  'brs20': '1', // 振动监测 1开启，0禁用
-  'brs28': '1', // 振动采样使能 1开启，0禁用
+  'brs19': '', // 防盗使能  1开启，0禁用
+  'brs20': '', // 振动监测 1开启，0禁用
+  'brs28': '', // 振动采样使能 1开启，0禁用
   'brs29': '', // 振动阈值1
   'brs30': '', // 振动阈值2
 }) // 表单
@@ -200,9 +200,9 @@
     'mhk03': '', // 设备采样周期 1- 30 分钟
     'mhk04': '', // 上传采样周期 1- 1440 分钟
     'mhk05': '', // GPS告警距离 1 - 65535 米
-    'mhk06': '1', // 确定设备安装位置 value = 1 生效
-    'mhk07': '1', // 清除安装位置 value = 1 生效
-    'mhk08': '1', // 重启设备 value = 1 生效
+    'mhk06': '', // 确定设备安装位置 value = 1 生效
+    'mhk07': '', // 清除安装位置 value = 1 生效
+    'mhk08': '', // 重启设备 value = 1 生效
 
     // 诺成新-燃气智能警示桩
     'ncx01': '', // 第一次上报时间 值，时分（整数）
@@ -226,9 +226,9 @@
     'brs11': '', // 传感器采集间隔 值，单位秒
     'brs12': '', // 采样深度
     'brs15': '', // 预热时间 值，单位秒
-    'brs19': '1', // 防盗使能  1开启，0禁用
-    'brs20': '1', // 振动监测 1开启，0禁用
-    'brs28': '1', // 振动采样使能 1开启，0禁用
+    'brs19': '', // 防盗使能  1开启，0禁用
+    'brs20': '', // 振动监测 1开启，0禁用
+    'brs28': '', // 振动采样使能 1开启，0禁用
     'brs29': '', // 振动阈值1
     'brs30': '', // 振动阈值2
   }
@@ -439,9 +439,13 @@
           instructionNCXresult.push({ command: 'length', value: length.join() })
           // 报警等
           const instructionSwitch = ['05', '06', '07', '08', '09', '10', '11', '12']
-          const alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          let alarm = instructionNCX.filter(item => instructionSwitch.includes(item.command)).map(item => item.value)
+          // alarm = alarm.map((item) => item ? item : '_') 
+          // console.log(alarm, 'alarm')
+          // console.log()
           alarm.push('1')
           instructionNCXresult.push({ command: 'switch', value: alarm.join(',').replaceAll(',', '') })
+
           otherData.commandConfigList = instructionNCXresult
         }
         // 百瑞生-管网哨兵
@@ -456,22 +460,22 @@
             }
           }
           otherData.commandConfigList = instructionBRS
-          const ignore = ['19', '20', '28']
-          if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
-            otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
-              if (ignore.includes(item.command)) {
-                if (String(item.value) === '1') {
-                  return false
-                }
-                else {
-                  return true
-                }
-              }
-              else {
-                return true
-              }
-            })
-          }
+          // const ignore = ['19', '20', '28']
+          // if (otherData.commandConfigList.some((item) => ignore.includes(item.command) && String(item.value) === '1')) {
+          //   otherData.commandConfigList = otherData.commandConfigList.filter((item) => {
+          //     if (ignore.includes(item.command)) {
+          //       if (String(item.value) === '1') {
+          //         return false
+          //       }
+          //       else {
+          //         return true
+          //       }
+          //     }
+          //     else {
+          //       return true
+          //     }
+          //   })
+          // }
         }
       }
       // console.log(otherData, 'otherData')
@@ -723,20 +727,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="防盗使能" prop="brs19">
-              <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs19" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs19" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动监测" prop="brs20">
-              <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs20" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs20" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="振动采样使能" prop="brs28">
-              <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.brs28" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.brs28" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -786,20 +802,32 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="确定位置" prop="mhk06">
-              <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk06" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="清除位置" prop="mhk07">
-              <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk07" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重启设备" prop="mhk08">
-              <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.mhk08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.mhk08" clearable style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
@@ -831,50 +859,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="倾斜报警" prop="ncx05">
-              <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx05" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx05" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="破坏报警" prop="ncx06">
-              <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx06" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx06" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="甲烷泄漏报警" prop="ncx07">
-              <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx07" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx07" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="语音报警" prop="ncx12">
-              <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx12" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                 <el-select v-model="dataForm.ncx12" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧断线报警" prop="ncx08">
-              <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx08" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx08" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧断线报警" prop="ncx09">
-              <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx09" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx09" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="左侧振动报警" prop="ncx10">
-              <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx10" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx10" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="右侧振动报警" prop="ncx11">
-              <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
-                inactive-value="0" />
+              <!-- <el-switch v-model="dataForm.ncx11" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="0" /> -->
+                <el-select v-model="dataForm.ncx11" style="width: 100%;">
+                  <el-option label="开" value="1"></el-option>
+                  <el-option label="关" value="0"></el-option>
+                </el-select>
             </el-form-item>
           </el-col>
         </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 67cc516..74c995a 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -44,6 +44,7 @@
   // pipeCode: [{ required: true, message: '关联管线不能为空', trigger: ['blur', 'change'] }],
   // ledgerName: [{ required: true, message: '闸井名称不能为空', trigger: ['blur', 'change'] }],
   locationCategory: [{ required: true, message: '位置类别不能为空', trigger: ['blur', 'change'] }],
+  propertyPhone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 
 const mapRef = ref()
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 12b2e16..ce23322 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -152,13 +152,18 @@
   gasData.value = []
   if (
     rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName.includes('管网哨兵')
   ) {
+        // rowData.value.deviceTypeName.includes('智能警示桩')
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+    descriptionsList.value.push( {
+    text: '设备运行状态',
+    value: 'runStatus',
+    align: 'center'
+  })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -166,7 +171,7 @@
     })
   } else {
     descriptionsList.value = descriptionsList.value.filter(
-      (item: any) => item.text !== '燃气浓度'
+      (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态'
     )
   }
   // console.log(e.info.row, 'e.info.row')
@@ -177,7 +182,8 @@
     .then(res => {
       loading.value = false
       detailInfo.value = res.data
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵'))) {
         return
       }
 
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 47d589a..0f85df1 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,13 +145,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
@@ -461,8 +461,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -473,7 +473,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index 4eb8c05..dbcf2f1 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -69,15 +69,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center'  },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -442,8 +442,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -454,7 +454,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index c98a38f..a6c7d24 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -8,7 +8,11 @@
 import player from '@/components/HKplayer/index.vue'
 import { ElMessage } from 'element-plus'
 import { getDeviceById } from '@/api/home/well/well'
-import { getDeviceID, getVideoUrl, getVideoBackUrl } from '@/api/home/station/video'
+import {
+  getDeviceID,
+  getVideoUrl,
+  getVideoBackUrl
+} from '@/api/home/station/video'
 import dayjs from 'dayjs'
 const dialogFormVisible = ref(false)
 const $route = useRoute()
@@ -20,7 +24,7 @@
   ledgerName: '', // 场站名称
   lngGaode: '',
   latGaode: '',
-  tagNumber: '',
+  tagNumber: ''
 })
 const resizePage = () => {
   setTimeout(() => {
@@ -31,7 +35,7 @@
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
 
-const videoType = ref('real')  // 视频类型   实时real和回放playback
+const videoType = ref('real') // 视频类型   实时real和回放playback
 // 详细信息
 const detailInfo = ref<{ [key: string]: string }>({})
 // 描述列表数据
@@ -39,39 +43,39 @@
   {
     text: '管理单位',
     value: 'deptName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '场站状态',
     value: 'onStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '详细位置',
     value: 'position',
-    align: 'center',
+    align: 'center'
   },
 
   {
     text: '负责人',
     value: 'personName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '标签',
     value: 'marker',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '监控状态',
     value: 'monitorStateName',
-    align: 'center',
+    align: 'center'
   },
   {
     text: '',
     value: '',
-    align: 'center',
-  },
+    align: 'center'
+  }
   // {
   //   text: '当前浓度',
   //   value: '',
@@ -125,7 +129,6 @@
   //   value: 'latGaode',
   //   align: 'center',
   // },
-
 ])
 const currentDeviceId = ref('')
 const playerVideo = (devcode: string) => {
@@ -134,31 +137,35 @@
     return
   }
   // unref(playRef).playerFun.createPlayer('ws://172.17.240.101:559/media?version=0.1&ciphersuites=0&sessionID', 1)
-  getDeviceID(devcode).then(res => {
-    const deviceId = res.data
-    if (!deviceId) {
-      ElMessage('设备ID为空，无法获取视频')
-      return
-    }
-    currentDeviceId.value = deviceId
-    getVideoUrl({
-      deviceId: deviceId,
-      streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
+  getDeviceID(devcode)
+    .then(res => {
+      const deviceId = res.data
+      if (!deviceId) {
+        ElMessage('设备ID为空，无法获取视频')
         return
       }
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
+      currentDeviceId.value = deviceId
+      getVideoUrl({
+        deviceId: deviceId,
+        streamType: '0'
+      })
+        .then(res => {
+          const videoUrl = res.data
+          if (!videoUrl) {
+            ElMessage('视频地址为空，无法播放')
+            return
+          }
+          // 播放视频
+          unref(playRef).playerFun.createPlayer(videoUrl, 1)
+        })
+        .catch(() => {
+          ElMessage.warning('获取设备视频失败')
+        })
     })
-  }).catch(() => {
-    currentDeviceId.value = ''
-    ElMessage.warning('获取设备ID失败')
-  })
+    .catch(() => {
+      currentDeviceId.value = ''
+      ElMessage.warning('获取设备ID失败')
+    })
 }
 // 初始化
 const playRef = ref()
@@ -175,32 +182,35 @@
   resizePage()
   // 获取详细信息
   loading.value = true
-  getWellDetail(e.info.id).then((res) => {
-    detailInfo.value = res.data
-    loading.value = false
-    if (res.data.personName && res.data.telephone) {
-      detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
-    }
-    // 处理监控状态
-    if (detailInfo.value.monitorStateName === '离线' && !$route.path.includes('station')) {
-      detailInfo.value.monitorStateName = '故障(离线)'
-    }
-    getDeviceById(e.info.id).then(res => {
-      deviceList.value = res.data.map((item: any) => ({
-        name: `${item.devcode}`,
-        devcode: item.devcode,
-      }))
-      if (deviceList.value.length) {
-        currentVideo.value = deviceList.value[0].name
-        // 默认播放第一路视频 (先获取设备id再根据id拿视频)
-        playerVideo(deviceList.value[0].devcode)
+  getWellDetail(e.info.id)
+    .then(res => {
+      detailInfo.value = res.data
+      loading.value = false
+      if (res.data.personName && res.data.telephone) {
+        detailInfo.value.personName = `${res.data.personName}(${res.data.telephone})`
       }
+      // 处理监控状态
+      if (
+        detailInfo.value.monitorStateName === '离线' &&
+        !$route.path.includes('station')
+      ) {
+        detailInfo.value.monitorStateName = '故障(离线)'
+      }
+      getDeviceById(e.info.id).then(res => {
+        deviceList.value = res.data.map((item: any) => ({
+          name: `${item.devcode}`,
+          devcode: item.devcode
+        }))
+        if (deviceList.value.length) {
+          currentVideo.value = deviceList.value[0].name
+          // 默认播放第一路视频 (先获取设备id再根据id拿视频)
+          playerVideo(deviceList.value[0].devcode)
+        }
+      })
     })
-
-
-  }).catch(() => {
-    loading.value = false
-  })
+    .catch(() => {
+      loading.value = false
+    })
 }
 
 // 关闭
@@ -213,8 +223,8 @@
   $router.push({
     path: '/station/detail',
     query: {
-      id: detailInfo.value.id,
-    },
+      id: detailInfo.value.id
+    }
   })
   close()
 }
@@ -246,104 +256,267 @@
     getVideoUrl({
       deviceId: currentDeviceId.value,
       streamType: '0'
-    }).then(res => {
-      const videoUrl = res.data
-      if (!videoUrl) {
-        ElMessage('视频地址为空，无法播放')
-        return
-      }
-
-      // 播放视频
-      unref(playRef).playerFun.createPlayer(videoUrl, 1)
-    }).catch(() => {
-      ElMessage.warning('获取设备视频失败')
     })
-  }
-  else if (type === 'playback') {
+      .then(res => {
+        const videoUrl = res.data
+        if (!videoUrl) {
+          ElMessage('视频地址为空，无法播放')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+
+        // 播放视频
+        unref(playRef).playerFun.createPlayer(videoUrl, 1)
+      })
+      .catch(() => {
+        ElMessage.warning('获取设备视频失败')
+        unref(playRef).playerFun.stopAllPlay()
+      })
+  } else if (type === 'playback') {
     unref(playRef).playerFun.stopAllPlay()
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
       endDate: endTime
-    }).then(res => {
-      if (!res.data) {
-        ElMessage.warning('回放地址为空')
-        return
-      }
-      // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
-    }).catch(() => {
-      ElMessage.warning('获取回放地址失败')
     })
+      .then(res => {
+        if (!res.data) {
+          ElMessage.warning('回放地址为空')
+          unref(playRef).playerFun.stopAllPlay()
+          return
+        }
+        // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    //     const startTime = dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+    // const endTime = dayjs(getFullTime()).add(2, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        unref(playRef).playerFun.replayFun({
+          url: res.data,
+          startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ')
+        })
+      })
+      .catch(() => {
+        ElMessage.warning('获取回放地址失败')
+         unref(playRef).playerFun.stopAllPlay()
+      })
   }
 }
 // const url = ref('')
 // const testVideo = () => {
 //   unref(playRef).playerFun.createPlayer(url.value, 1)
 // }
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
   <div class="dialog">
-    <el-dialog v-model="dialogFormVisible" append-to-body class="dialog" custom-class="dialog" :show-close="false"
-      width="950px" style="background-color: transparent;box-shadow: none;">
-      <div v-show="dialogFormVisible" class="container clearfix" @mouseleave="() => { }">
+    <el-dialog
+      v-model="dialogFormVisible"
+      append-to-body
+      class="dialog"
+      custom-class="dialog"
+      :show-close="false"
+      width="950px"
+      style="background-color: transparent; box-shadow: none"
+    >
+      <div
+        v-show="dialogFormVisible"
+        class="container clearfix"
+        @mouseleave="() => {}"
+      >
         <div class="header">
-          <div style="display: flex;align-items: center;">
-            <el-tooltip class="box-item" effect="dark" :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
-              placement="top">
-              <span class="title">{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span>
+          <div style="display: flex; align-items: center">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="`${baseInfo.tagNumber} | ${baseInfo.ledgerName}`"
+              placement="top"
+            >
+              <span class="title"
+                >{{ baseInfo.tagNumber }} | {{ baseInfo.ledgerName }}</span
+              >
             </el-tooltip>
-            <el-button size="small" style="margin-left: 10px;" @click="goDetail">
+            <el-button size="small" style="margin-left: 10px" @click="goDetail">
               详情
             </el-button>
           </div>
           <span class="close1" @click="close">×</span>
         </div>
         <!-- 云台视频 -->
-        <div v-if="deviceList.length" class="video">
+        <div v-if="deviceList.length" class="video" :style="{height: `${videoType === 'playback'? 370 : 290}px`}">
           <div class="video-menu">
-            <div v-for="item in deviceList" :key="item" class="menu-item"
-              :class="item.name === currentVideo ? 'active' : ''" @click="changeVideo(item)">
+            <div
+              v-for="item in deviceList"
+              :key="item"
+              class="menu-item"
+              :class="item.name === currentVideo ? 'active' : ''"
+              @click="changeVideo(item)"
+            >
               {{ item.name }}
             </div>
           </div>
           <div class="video-container">
             <div class="video-control">
-              <div style="width: 50%;display: flex;justify-content: center;">
-                <el-button :type="videoType === 'real' ? 'primary' : ''" round size="small" @click="handler('real')">
+              <div style="width: 50%; display: flex; justify-content: center">
+                <el-button
+                  :type="videoType === 'real' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handler('real')"
+                >
                   预览
                 </el-button>
-                <el-button :type="videoType === 'playback' ? 'primary' : ''" round size="small"
-                  @click="handler('playback')">
+                <el-button
+                  :type="videoType === 'playback' ? 'primary' : ''"
+                  round
+                  size="small"
+                  @click="handleTimeChange"
+                >
                   回放
                 </el-button>
-                <el-button round size="small">
-                  报警
-                </el-button>
+                <el-button round size="small"> 报警 </el-button>
                 <!-- <el-button round size="small" @click="testVideo" >
                   测试播放
                 </el-button>
                 <el-input v-model="url" style="width: 1000px;height: 30px;" clearable></el-input> -->
               </div>
             </div>
-            <div class="video-player" style="width: 710px;height: 250px;">
+            <div class="video-player" style="width: 710px; height: 250px">
               <!-- <video src="" autoplay muted controls /> -->
-              <player v-if="dialogFormVisible" ref="playRef" @error="playerError" :iWidth="710" :iHeight="250" />
+              <player
+                v-if="dialogFormVisible"
+                ref="playRef"
+                @error="playerError"
+                :iWidth="710"
+                :iHeight="250"
+              />
             </div>
+              <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
           </div>
         </div>
         <div class="body">
           <div class="descriptions" v-loading="loading">
-            <div v-for="(item, index) in descriptionsList" :key="item.text"
-              :style="{ width: index % 2 === 0 ? '65%' : '32%' }" class="descriptions-item">
+            <div
+              v-for="(item, index) in descriptionsList"
+              :key="item.text"
+              :style="{ width: index % 2 === 0 ? '65%' : '32%' }"
+              class="descriptions-item"
+            >
               <div :class="index % 2 === 0 ? 'label' : 'label1'">
                 {{ item.text }}
               </div>
-              <div v-if="item.text !== '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'"
-                :title="detailInfo[item.value] || ''">
+              <div
+                v-if="item.text !== '当前浓度'"
+                :class="index % 2 === 0 ? 'value' : 'value1'"
+                :title="detailInfo[item.value] || ''"
+              >
                 {{ detailInfo[item.value] || '' }}
               </div>
               <!-- <div v-if="item.text === '当前浓度'" :class="index % 2 === 0 ? 'value' : 'value1'">
@@ -354,6 +527,7 @@
               </div> -->
             </div>
           </div>
+          
         </div>
       </div>
     </el-dialog>
@@ -361,6 +535,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container {
   width: 100%;
   background: #fff;
@@ -370,7 +556,6 @@
   overflow: hidden;
   box-shadow: 0 0 12px rgb(0 0 0 / 12%);
 
-
   .header {
     float: right;
     background-color: #0d76d4;
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 0bd414d..2294a5f 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -89,6 +89,7 @@
   // }
   if (!currentDeviceId.value) {
     ElMessage.warning('设备ID为空')
+    unref(playRef).playerFun.stopAllPlay()
     return
   }
   unref(playRef).playerFun.stopAllPlay()
@@ -102,17 +103,19 @@
       const videoUrl = res.data
       if (!videoUrl) {
         ElMessage('视频地址为空，无法播放')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 播放视频
       unref(playRef).playerFun.createPlayer(videoUrl, 1)
     }).catch(() => {
       ElMessage.warning('获取设备视频失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
   else if (type === 'playback') {
-    const startTime = dayjs().subtract(0.5, 'hour').format('YYYY-MM-DD HH:mm:ss')
-    const endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    const startTime = dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const endTime = dayjs(getFullTime()).format('YYYY-MM-DD HH:mm:ss')
     getVideoBackUrl({
       deviceId: currentDeviceId.value,
       beginDate: startTime,
@@ -120,12 +123,14 @@
     }).then(res => {
       if (!res.data) {
         ElMessage.warning('回放地址为空')
+        unref(playRef).playerFun.stopAllPlay()
         return
       }
       // 回放时间格式要转为 format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
+      unref(playRef).playerFun.replayFun({ url: res.data, startTime: dayjs(getFullTime()).subtract(1, 'minutes').format('YYYY-MM-DDTHH:mm:ss.SSSZ'), endTime: dayjs(getFullTime()).format('YYYY-MM-DDTHH:mm:ss.SSSZ') })
     }).catch(() => {
       ElMessage.warning('获取回放地址失败')
+      unref(playRef).playerFun.stopAllPlay()
     })
   }
 }
@@ -152,6 +157,88 @@
   resizePage()
 })
 const { proxy } = getCurrentInstance() as any
+
+// 选中的日期（默认今天）
+const selectedDate = ref(new Date().toISOString().split('T')[0])
+
+const timeValue = ref(parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm'))) // 默认选中08:00
+
+// 重要时间点（只显示这些时间点的刻度）
+const importantTimePoints = computed(() => [
+  0, // 00:00
+  240, // 04:00
+  480, // 08:00
+  720, // 12:00
+  960, // 16:00
+  1200, // 20:00
+  1440 // 24:00
+])
+
+// 生成时间轴刻度（只显示重要时间点）
+const timeMarks = computed(() => {
+  const marks = {}
+  importantTimePoints.value.forEach(minute => {
+    marks[minute] = {
+      style: {
+        color: minute === timeValue.value ? '#409eff' : '#666',
+        fontSize: '12px',
+        fontWeight: minute === timeValue.value ? 'bold' : 'normal'
+      },
+      label: minute === 1440 ? '24:00' : formatTime(minute)
+    }
+  })
+  return marks
+})
+
+// 日期变化时重置时间（默认08:00）
+const handleDateChange = date => {
+  if (date) {
+    timeValue.value = parseTimeToMinutes1(dayjs().subtract(1, 'minutes').format('HH:mm')) // 重置为08:00
+    handleTimeChange()
+  }
+}
+
+// 将分钟转换为时间格式（如 480分钟 → 08:00）
+const formatTime = minute => {
+  const hours = Math.floor(minute / 60)
+  const mins = minute % 60
+  return `${hours.toString().padStart(2, '0')}:${mins
+    .toString()
+    .padStart(2, '0')}`
+}
+function parseTimeToMinutes1(timeStr) {
+  // 分割小时和分钟部分（支持 "8:00"、"08:30" 等格式）
+  const [hoursStr, minutesStr] = timeStr.split(':');
+  
+  // 转换为数字并计算总分钟数
+  const hours = parseInt(hoursStr, 10);
+  const minutes = parseInt(minutesStr || 0, 10); // 若没有分钟部分，默认为0
+  
+  // 验证输入有效性
+  if (isNaN(hours) || hours < 0 || hours > 24) {
+    throw new Error('小时数必须在0-24之间');
+  }
+  if (isNaN(minutes) || minutes < 0 || minutes > 59) {
+    throw new Error('分钟数必须在0-59之间');
+  }
+  
+  // 计算总分钟数（24:00 视为 1440 分钟）
+  return hours === 24 ? 1440 : hours * 60 + minutes;
+};
+// 对外暴露选中的完整时间（供父组件使用）
+const getFullTime = () => {
+  const baseDate = new Date(selectedDate.value)
+  baseDate.setHours(Math.floor(timeValue.value / 60), timeValue.value % 60, 0)
+  return baseDate
+}
+const handleTimeChange = () => {
+  console.log(getFullTime())
+  handler('playback')
+}
+
+const formatTooltip = value => {
+  return formatTime(value) // 将分钟值转换为 HH:MM 格式
+}
 </script>
 
 <template>
@@ -164,7 +251,7 @@
           <el-button :type="videoType === 'real' ? 'primary' : ''" round @click="handler('real')">
             预览
           </el-button>
-          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handler('playback')">
+          <el-button :type="videoType === 'playback' ? 'primary' : ''" round @click="handleTimeChange">
             回放
           </el-button>
         </div>
@@ -176,7 +263,34 @@
       </div>
       <!-- 云台控制按钮 -->
       <div>
-        <div class="control-btn">
+        <!-- 时间轴 -->
+              <div v-if="videoType === 'playback'" class="time-point-picker" style="display: flex;flex-direction: column;justify-content: center;align-items: center;position: relative;margin-top: 10px;margin-bottom: 15px;">
+                <!-- 日期选择器 -->
+                <el-date-picker
+                  v-model="selectedDate"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="选择日期"
+                  @change="handleDateChange"
+                />
+                <!-- 时间轴滑块（单点选择） -->
+                <div class="time-slider-container" style="width: 100%;">
+                  <!-- 滑块组件 -->
+                  <el-slider
+                    v-model="timeValue"
+                    :min="0"
+                    :max="1440"
+                    :step="1"
+                    :marks="timeMarks"
+                    :format-tooltip="formatTooltip"
+                    tooltip-class="time-slider-tooltip"
+                    class="custom-slider"
+                    @change="handleTimeChange"
+                  />
+                </div>
+              </div>
+        <div class="control-btn" v-if="videoType === 'real'">
           <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
@@ -189,6 +303,18 @@
 </template>
 
 <style lang="scss" scoped>
+::v-deep .time-slider-tooltip {
+  font-size: 14px !important;
+  padding: 6px 10px !important;
+}
+::v-deep(.el-slider__bar) {
+  background-color: #e4e7ed;
+}
+::v-deep(.el-slider__button) {
+  width: 4px;
+  border-radius: 0;
+  background-color: #a39f9f;
+}
 .container-station {
   width: 100%;
   display: flex;
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 5d32d49..3734639 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -122,15 +122,21 @@
   rowData.value = e.info.row
   loading.value = true
   gasData.value = []
+  //  ||
+    // rowData.value.deviceTypeName?.includes('智能警示桩')
   if (
     rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName?.includes('管网哨兵') ||
-    rowData.value.deviceTypeName?.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('管网哨兵')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
       (item: any) => item.text !== '燃气浓度'
     )
+  //   descriptionsList.value.push({
+  //   text: '监控状态',
+  //   value: 'monitorStateName',
+  //   align: 'center'
+  // })
     descriptionsList.value.push({
       text: '燃气浓度',
       value: 'manageType',
@@ -152,7 +158,8 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
+      // || rowData.value.deviceTypeName?.includes('智能警示桩')
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') )) {
         return
       }
       if(res.data.installDate) {
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index 6b8d668..6bff419 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -107,8 +107,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -138,13 +138,13 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
   { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index fe87be1..8160888 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -114,8 +114,8 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   {
     text: '桩倾斜报警',
@@ -145,16 +145,16 @@
     text: '右断线报警',
     value: 'rightOffLineAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
   {
     text: '右振动报警',
     value: 'rightVibrateAlarm',
     align: 'center',
-    width: '95'
+    width: ''
   },
-  { text: '采集时间', value: 'uptime', align: 'center', width: '180' },
-  { text: '上传时间', value: 'logtime', align: 'center', width: '180' }
+  { text: '采集时间', value: 'uptime', align: 'center', width: '' },
+  { text: '上传时间', value: 'logtime', align: 'center', width: '' }
 ])
 // 场站监测云台
 const columns4 = ref<any>([
@@ -565,8 +565,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -577,7 +577,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 9c267b1..3d65097 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -87,15 +87,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -562,8 +562,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -574,7 +574,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({
diff --git a/src/views/home/tool/index.vue b/src/views/home/tool/index.vue
index 9254c45..03833d1 100644
--- a/src/views/home/tool/index.vue
+++ b/src/views/home/tool/index.vue
@@ -37,7 +37,7 @@
 const menuX = ref(0)
 const menuY = ref(0)
 const completeMap = () => {
-  console.log('地图加载完成')
+  // console.log('地图加载完成')
   isComplete.value = true
   if (deviceList.value.length) {
     // 绘制点位
@@ -91,7 +91,7 @@
     offset: 1,
     limit: 9999
   }).then(res => {
-    console.log(res.data, '诺成新设备数据')
+    // console.log(res.data, '诺成新设备数据')
     deviceList.value = res.data.rows.filter(
       (item: any) => item.lat && item.lng && item.id && item.devcode
     )
@@ -137,10 +137,15 @@
   })
   mapRef.value.map.add([polyline])
   polyline.on('rightclick', e => {
+    if (loadingBtn.value) {
+      ElMessage.warning('数据正在保存中，请等待')
+      return
+    }
     if (polyEditor.value) {
       ElMessage.warning('正在编辑中，请先完成编辑')
       return
     }
+
     // 弹出菜单
     // 获取地图容器偏移量
     const containerRect = mapContainer.value.getBoundingClientRect()
@@ -181,6 +186,7 @@
           item.lngGd &&
           item.type
       )
+      // console.log(lineList.value, 'lineList.value')
       if (reset) {
         // 获取地图实例中的所有覆盖物
         const overlays = mapRef.value.map.getAllOverlays()
@@ -206,6 +212,10 @@
 
 // 点击设备点位
 const massMarksClick = (data: any) => {
+  if (loadingBtn.value) {
+    ElMessage.warning('数据正在保存中，请等待')
+    return
+  }
   if (polyEditor.value) {
     ElMessage.warning('正在编辑中，请先完成编辑')
     return
@@ -224,7 +234,7 @@
   const line = lineList.value.filter(
     (item: any) => item.deviceId === currentDevice.value
   )
-  if (line.length === 2) {
+  if (line.length >= 2) {
     currentDevice.value = ''
     currentCode.value = ''
     ElMessage.warning('该设备已有两条线段，请勿重复添加')
@@ -263,13 +273,13 @@
   polyEditor.value.close()
   currentLine.value.setMap(null)
   polyEditor.value = ''
-  console.log(handlerType.value, 'handlerType.value')
+  // console.log(handlerType.value, 'handlerType.value')
   if (handlerType.value === 'edit') {
     const line = lineList.value.find(
       (item: any) =>
         item.deviceId === currentDevice.value && item.type === item.type
     )
-    console.log(line)
+    // console.log(line)
     drawLine(line)
   }
   // 清空
@@ -297,6 +307,7 @@
 }
 
 // 保存线
+const loadingBtn = ref(false)
 const saveLine = () => {
   if (!currentDevice.value || !currentLine.value) {
     return
@@ -308,6 +319,14 @@
   }))
   // 判断是编辑还是新建
   if (handlerType.value === 'add') {
+    if (
+      lineList.value.filter(
+        (item: any) => item.deviceCode === currentCode.value
+      ).length >= 2
+    ) {
+      return
+    }
+    loadingBtn.value = true
     addNcxPosition({
       deviceCode: currentCode.value,
       deviceId: currentDevice.value,
@@ -317,6 +336,7 @@
       ts: dayjs().format('YYYY-MM-DD HH:mm:ss')
     })
       .then(() => {
+        loadingBtn.value = false
         ElMessage.success('保存成功')
         polyEditor.value.close()
         polyEditor.value = ''
@@ -329,6 +349,7 @@
         fetchLine(true)
       })
       .catch(() => {
+        loadingBtn.value = false
         polyEditor.value.close()
         polyEditor.value = ''
         currentLine.value.setMap(null)
@@ -339,6 +360,7 @@
         item.deviceId === currentDevice.value && item.type === item.type
     )
     if (line) {
+      loadingBtn.value = true
       editNcxPosition({
         ...line,
         latGd: path.map((item: any) => item.lat).join(),
@@ -346,6 +368,7 @@
         ts: dayjs().format('YYYY-MM-DD HH:mm:ss')
       })
         .then(res => {
+          loadingBtn.value = false
           ElMessage.success('保存成功')
           polyEditor.value.close()
           polyEditor.value = ''
@@ -358,6 +381,7 @@
           fetchLine(true)
         })
         .catch(() => {
+          loadingBtn.value = false
           polyEditor.value.close()
           polyEditor.value = ''
           currentLine.value.setMap(null)
@@ -389,10 +413,12 @@
             currentLine.value = ''
             lineType.value = ''
             handlerType.value = ''
-            lineList.value = lineList.value.filter(
-              (item: any) =>
-                item.deviceId === line.deviceId && item.type === line.type
-            )
+            // 重新获取线
+            fetchLine(true)
+            // lineList.value = lineList.value.filter(
+            //   (item: any) =>
+            //     item.deviceId === line.deviceId && item.type === line.type
+            // )
           })
           .catch(() => {
             handlerType.value = ''
@@ -481,12 +507,14 @@
     <div class="btn-container">
       <el-button
         type="primary"
-        :disabled="!currentDevice || menuVisible"
+        :disabled="!currentDevice || menuVisible || loadingBtn"
         @click="saveLine"
         >保存</el-button
       >
-      <el-button :disabled="!currentDevice || menuVisible" @click="cancelLine"
-        >{{ handlerType === 'edit' ? '取消' : '删除'}}</el-button
+      <el-button
+        :disabled="!currentDevice || menuVisible"
+        @click="cancelLine"
+        >{{ handlerType === 'edit' ? '取消' : '删除' }}</el-button
       >
       <el-tooltip placement="bottom">
         <template #content>
diff --git a/src/views/home/well/components/monitorDataList.vue b/src/views/home/well/components/monitorDataList.vue
index a2dfe1b..f255aef 100644
--- a/src/views/home/well/components/monitorDataList.vue
+++ b/src/views/home/well/components/monitorDataList.vue
@@ -87,15 +87,15 @@
 ])
 // 智能警示桩
 const columns3 = ref<any>([
-  { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
-  { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
+  // { text: '左侧甲烷值', value: 'leftGas', align: 'center', width: '95' },
+  // { text: '右侧甲烷值', value: 'rightGas', align: 'center', width: '95' },
   { text: '电池电压(V)', value: 'vbat', align: 'center', width: '100' },
   { text: '桩倾斜报警', value: 'pipeInclineAlarm', align: 'center', width: '95' },
   { text: '桩拆卸报警', value: 'pipeBreakAlarm', align: 'center', width: '95' },
   { text: '左断线报警', value: 'leftOffLineAlarm', align: 'center', width: '95' },
   { text: '左振动报警', value: 'leftVibrateAlarm', align: 'center', width: '95' },
-  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '95' },
-  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '95' },
+  { text: '右断线报警', value: 'rightOffLineAlarm', align: 'center', width: '' },
+  { text: '右振动报警', value: 'rightVibrateAlarm', align: 'center', width: '' },
   { text: '采集时间', value: 'uptime', align: 'center' },
   { text: '上传时间', value: 'logtime', align: 'center' },
 ])
@@ -555,8 +555,8 @@
     columns3: {
       list: list.value.map((item: any, index: number) => ({
         '1index': index + 1,
-        '2leftGas': item.leftGas,
-        '3rightGas': item.rightGas,
+        // '2leftGas': item.leftGas,
+        // '3rightGas': item.rightGas,
         '4vbat': item.vbat,
         '5pipeInclineAlarm': item.pipeInclineAlarm,
         '6pipeBreakAlarm': item.pipeBreakAlarm,
@@ -567,7 +567,8 @@
         '11uptime': item.uptime,
         '12logtime': item.logtime
       })),
-      columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      // columns: ['序号', '左侧甲烷值', '右侧甲烷值', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
+      columns: ['序号', '电池电压(V)', '桩倾斜报警', '桩拆卸报警', '左断线报警', '左振动报警', '右断线报警', '右振动报警', '采集时间', '上传时间']
     },
     columns4: {
       list: list.value.map((item: any, index: number) => ({