diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index f3cbbbe..d65f218 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -52,7 +52,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -81,7 +81,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index f3cbbbe..d65f218 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -52,7 +52,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -81,7 +81,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index feca4fe..6bf2151 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -190,7 +190,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -318,7 +318,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index f3cbbbe..d65f218 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -52,7 +52,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -81,7 +81,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index feca4fe..6bf2151 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -190,7 +190,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -318,7 +318,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e3a1913..a44fe4b 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -86,7 +86,7 @@
   },
   {
     text: '负责人',
-    value: '',
+    value: 'principal',
     align: 'center',
   },
   // {

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index f3cbbbe..d65f218 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -52,7 +52,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -81,7 +81,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index feca4fe..6bf2151 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -190,7 +190,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -318,7 +318,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e3a1913..a44fe4b 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -86,7 +86,7 @@
   },
   {
     text: '负责人',
-    value: '',
+    value: 'principal',
     align: 'center',
   },
   // {
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index c7c37be..abef23d 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -178,7 +178,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
@@ -223,7 +223,7 @@
     })
     // mapRef.value.map.setCenter(data.lnglat)
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index f3cbbbe..d65f218 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -52,7 +52,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -81,7 +81,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index feca4fe..6bf2151 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -190,7 +190,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -318,7 +318,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e3a1913..a44fe4b 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -86,7 +86,7 @@
   },
   {
     text: '负责人',
-    value: '',
+    value: 'principal',
     align: 'center',
   },
   // {
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index c7c37be..abef23d 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -178,7 +178,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
@@ -223,7 +223,7 @@
     })
     // mapRef.value.map.setCenter(data.lnglat)
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 1c5a64c..83a956f 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -142,7 +142,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -170,7 +170,7 @@
     // mapRef.value.map.setCenter(data.lnglat)
     // mapRef.value.map.setFitView()
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index f3cbbbe..d65f218 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -52,7 +52,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -81,7 +81,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index feca4fe..6bf2151 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -190,7 +190,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -318,7 +318,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e3a1913..a44fe4b 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -86,7 +86,7 @@
   },
   {
     text: '负责人',
-    value: '',
+    value: 'principal',
     align: 'center',
   },
   // {
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index c7c37be..abef23d 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -178,7 +178,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
@@ -223,7 +223,7 @@
     })
     // mapRef.value.map.setCenter(data.lnglat)
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 1c5a64c..83a956f 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -142,7 +142,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -170,7 +170,7 @@
     // mapRef.value.map.setCenter(data.lnglat)
     // mapRef.value.map.setFitView()
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index 55f4f08..2a2d50e 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -65,16 +65,16 @@
     value: 'deptName',
     align: 'center',
   },
-  // {
-  //   text: '负责人',
-  //   value: '',
-  //   align: 'center',
-  // },
-  // {
-  //   text: '负责人联系方式',
-  //   value: '',
-  //   align: 'center',
-  // },
+  {
+    text: '负责人',
+    value: 'principal',
+    align: 'center',
+  },
+  {
+    text: '负责人联系方式',
+    value: '',
+    align: 'center',
+  },
   {
     text: '运行状态',
     value: 'validName',

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index f3cbbbe..d65f218 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -52,7 +52,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -81,7 +81,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index feca4fe..6bf2151 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -190,7 +190,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -318,7 +318,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e3a1913..a44fe4b 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -86,7 +86,7 @@
   },
   {
     text: '负责人',
-    value: '',
+    value: 'principal',
     align: 'center',
   },
   // {
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index c7c37be..abef23d 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -178,7 +178,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
@@ -223,7 +223,7 @@
     })
     // mapRef.value.map.setCenter(data.lnglat)
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 1c5a64c..83a956f 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -142,7 +142,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -170,7 +170,7 @@
     // mapRef.value.map.setCenter(data.lnglat)
     // mapRef.value.map.setFitView()
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index 55f4f08..2a2d50e 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -65,16 +65,16 @@
     value: 'deptName',
     align: 'center',
   },
-  // {
-  //   text: '负责人',
-  //   value: '',
-  //   align: 'center',
-  // },
-  // {
-  //   text: '负责人联系方式',
-  //   value: '',
-  //   align: 'center',
-  // },
+  {
+    text: '负责人',
+    value: 'principal',
+    align: 'center',
+  },
+  {
+    text: '负责人联系方式',
+    value: '',
+    align: 'center',
+  },
   {
     text: '运行状态',
     value: 'validName',
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index a3f84a1..a9642f8 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -17,7 +17,7 @@
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '是否误报', value: 'realAlarm', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index f3cbbbe..d65f218 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -52,7 +52,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -81,7 +81,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index feca4fe..6bf2151 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -190,7 +190,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -318,7 +318,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e3a1913..a44fe4b 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -86,7 +86,7 @@
   },
   {
     text: '负责人',
-    value: '',
+    value: 'principal',
     align: 'center',
   },
   // {
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index c7c37be..abef23d 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -178,7 +178,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
@@ -223,7 +223,7 @@
     })
     // mapRef.value.map.setCenter(data.lnglat)
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 1c5a64c..83a956f 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -142,7 +142,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -170,7 +170,7 @@
     // mapRef.value.map.setCenter(data.lnglat)
     // mapRef.value.map.setFitView()
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index 55f4f08..2a2d50e 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -65,16 +65,16 @@
     value: 'deptName',
     align: 'center',
   },
-  // {
-  //   text: '负责人',
-  //   value: '',
-  //   align: 'center',
-  // },
-  // {
-  //   text: '负责人联系方式',
-  //   value: '',
-  //   align: 'center',
-  // },
+  {
+    text: '负责人',
+    value: 'principal',
+    align: 'center',
+  },
+  {
+    text: '负责人联系方式',
+    value: '',
+    align: 'center',
+  },
   {
     text: '运行状态',
     value: 'validName',
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index a3f84a1..a9642f8 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -17,7 +17,7 @@
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '是否误报', value: 'realAlarm', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue
index 5d9ec48..80313b1 100644
--- a/src/views/home/well/components/map.vue
+++ b/src/views/home/well/components/map.vue
@@ -142,7 +142,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -168,7 +168,7 @@
       map: mapRef.value.map,
     })
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }

diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue
index b892529..ff678cb 100644
--- a/src/components/TableContainer/index.vue
+++ b/src/components/TableContainer/index.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/component-name-in-template-casing -->
+eslint-disable vue/component-name-in-template-casing
 <script lang="ts" setup name="TableContainer">
 import { Menu } from '@element-plus/icons-vue'
 import configDialog from './configColumnsDialog.vue'
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ceceb48..3bead3b 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -123,7 +123,7 @@
     <pending-dialog ref="pendingRef" @refresh="refresh" />
     <!-- 提醒责任人 -->
     <remind-dialog ref="remindRef" @refresh="refresh" />
-    <!-- 查看数据 -->`
+    <!-- 查看数据 -->
     <monitor-data-dialog ref="dataRef" @refresh="refresh" />
     <!-- 流程图 -->
     <process-dialog ref="processRef" @refresh="refresh" />
diff --git a/src/views/home/alarm/current/components/map.vue b/src/views/home/alarm/current/components/map.vue
index dee88d7..38c0f7a 100644
--- a/src/views/home/alarm/current/components/map.vue
+++ b/src/views/home/alarm/current/components/map.vue
@@ -53,7 +53,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -82,7 +82,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 43b6957..730e96d 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="挂起时间" prop="suspendTime">
+          <el-form-item label="挂起时间(h)" prop="suspendTime">
             <el-input-number v-model="dataForm.suspendTime" :min="1" :max="99" :step="1" step-strictly />
           </el-form-item>
         </el-col>
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 5bedbdf..0987798 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -292,7 +292,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -373,7 +373,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/current/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/current/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 1e7a305..d65e913 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -83,17 +83,17 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 
 .active {
   color: #3d7eff;
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f28f557..08d7a93 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -208,13 +208,13 @@
   }
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5cf34fb..e973da6 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -81,12 +81,13 @@
 .content {
   padding: 10px;
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   flex-wrap: wrap;
 
   .item {
-    width: 46%;
+    width: 48%;
     display: flex;
+    // justify-content: space-between;
     margin: 20px 0;
 
     img {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 81c3a90..3dd0897 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -46,13 +46,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 21a8911..c933977 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -119,15 +119,15 @@
   background-color: rgba($color: #98a7bb, $alpha: 80%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+//   // overflow: hidden;
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index 50cab39..5410d2f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -69,17 +69,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
 
-  // overflow: hidden;
-}
+// overflow: hidden;
+// }
 
 ::v-deep(.el-progress__text) {
   color: #fff;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index a003dfa..003c20f 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -72,13 +72,13 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/layout.vue b/src/views/home/dashboard/fullScreen-components/layout.vue
index 029e63a..b970aa0 100644
--- a/src/views/home/dashboard/fullScreen-components/layout.vue
+++ b/src/views/home/dashboard/fullScreen-components/layout.vue
@@ -78,11 +78,12 @@
     display: flex;
     justify-content: space-between;
     padding: 0 15px;
+    padding-left: 10px;
 
     .title {
       color: #fff;
       font-weight: 700;
-      padding-left: 20px;
+      // padding-left: 20px;
       box-sizing: border-box;
     }
 
diff --git a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
index 1e2760f..61303e4 100644
--- a/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/monitorDeviceCount.vue
@@ -51,15 +51,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 113710f..3a7433a 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -39,15 +39,15 @@
 </template>
 
 <style lang="scss" scoped>
-.layout {
-  ::v-deep(.title) {
-    padding-left: 8px !important;
-    color: #fff;
-    font-weight: 700;
-    // padding-left: 20px;
-    box-sizing: border-box;
-  }
-}
+// .layout {
+//   ::v-deep(.title) {
+//     padding-left: 8px !important;
+//     color: #fff;
+//     font-weight: 700;
+//     // padding-left: 20px;
+//     box-sizing: border-box;
+//   }
+// }
 
 ::v-deep(.el-loading-mask) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 4ba7b87..a54242b 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -253,7 +253,11 @@
   <localtion-for-pieple ref="piepleRef" @confirm="comfirmLocation" />
   <localtion-for-station ref="stationRef" @confirm="comfirmLocation" />
   <localtion-for-well ref="wellRef" @confirm="comfirmLocation" />
-  <el-dialog v-model="dialogFormVisible1" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+  <div v-show="dialogFormVisible1" class="dialog" :title="`${textMap[dialogStatus]}设备`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}设备` }}</span>
+      <span class="close" @click="() => dialogFormVisible1 = false">x</span>
+    </div>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="120px">
       <el-row :gutter="24">
         <el-col :span="24">
@@ -361,17 +365,17 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <!-- <templater> -->
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+    <!-- </template> -->
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -382,4 +386,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index ea35001..ce3d8ba 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -39,27 +39,27 @@
 //  列表展示列
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警类型', value: 'alarmTypeName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '报警状态', value: 'processStatusName', align: 'center' },
   { text: '现场确认', value: 'confirmMsg', align: 'center' },
   { text: '现场处置', value: 'processMsg', align: 'center' },
-  { text: '处置人员', value: 'approval_person', align: 'center' },
+  { text: '处置人员', value: 'processPerson', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
 ])
 const fetchData = () => {
   const data = JSON.parse($route.query.row as string)
   listQuery.value.devcode = data.devcode
   loadingTable.value = true
-  console.log(1223)
   getAlarmRecord(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item)).map((item: any) => ({
       ...item,
-      alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
-      alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
-      processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
+      // alarmTypeName: alarmTypeList.value.filter((citem: any) => citem.id === item.alarmTypeId)[0]?.alarmType || '',
+      // alarmLevelName: alarmLevelList.value.filter((citem: any) => citem.id === item.alarmLevel)[0]?.alarmLevel || '',
+      // processStatusName: alarmStatusList.value.filter((citem: any) => citem.value === item.processStatus)[0]?.name || '',
     }))
+    console.log(list.value, 'list.value')
     loadingTable.value = false
   }).catch(() => {
     loadingTable.value = false
@@ -76,9 +76,9 @@
   getAlarmTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     alarmTypeList.value = res.data.rows
   })
-  getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
-    alarmLevelList.value = res.data.rows
-  })
+  // getAlarmLevelListPage({ offset: 1, limit: 99999 }).then((res) => {
+  //   alarmLevelList.value = res.data.rows
+  // })
   // 报警状态
   getDictByCode('alarmStatus').then((res) => {
     alarmStatusList.value = res.data
@@ -100,7 +100,7 @@
         v-model="listQuery.alarmType" placeholder="报警类型" filterable clearable class="select"
         style="width: 192px;"
       >
-        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-option v-for="item in alarmTypeList" :key="item.id" :label="item.alarmType" :value="item.id" />
       </el-select>
       <el-date-picker
         v-model="timerangForReport" type="datetimerange" range-separator="至" start-placeholder="报警开始时间"
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index fe0a705..3bea05e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -43,10 +43,19 @@
 })
 timerangForCollect.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
 timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+const showTable = ref(true)
+const resizePage = () => {
+  setTimeout(() => {
+    const resize = new Event('resize')
+    window.dispatchEvent(resize)
+  }, 500)
+}
 // 列表loading
 const loadingTable = ref(true)
 //  列表展示数据
-const list = ref([])
+const list = ref<any[]>([])
+const xAxisData = ref<any[]>([])
+const data = ref<any[]>([])
 //  列表展示列
 const columns = ref<any>([
   { text: '设备编号', value: 'devcode', align: 'center' },
@@ -63,8 +72,27 @@
   loadingTable.value = true
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
-    console.log(list.value, '123')
+    xAxisData.value = list.value.slice().reverse().map(item => item.logtime)
+    data.value = [
+      {
+        name: '燃气浓度',
+        data: list.value.slice().reverse().map(item => item.snr || '0'),
+      },
+      {
+        name: '电量',
+        data: list.value.slice().reverse().map(item => item.cell || '0'),
+      },
+      {
+        name: '信号强度',
+        data: list.value.slice().reverse().map(item => item.strength || '0'),
+      },
+    ]
+    console.log(xAxisData.value, data.value)
     loadingTable.value = false
+    if (!showTable.value) {
+      // fetchData()
+      resizePage()
+    }
   }).catch(() => {
     loadingTable.value = false
   })
@@ -75,6 +103,15 @@
     fetchData()
   })
 })
+
+// 切换视图
+const changeView = () => {
+  showTable.value = !showTable.value
+  if (!showTable.value) {
+    fetchData()
+    resizePage()
+  }
+}
 </script>
 
 <template>
@@ -96,13 +133,13 @@
       <el-button type="primary" style="margin-left: 10px;">
         导出
       </el-button>
-      <el-button type="primary" style="margin-left: 10px;">
+      <el-button type="primary" style="margin-left: 10px;" @click="changeView">
         切换视图
       </el-button>
     </template>
     <normal-table
-      :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false"
+      v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery"
+      :list-loading="loadingTable" :pagination="false"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
@@ -112,5 +149,20 @@
         </el-table-column>
       </template>
     </normal-table>
+    <div v-show="!showTable" style="height: 250px;">
+      <line-chart
+        v-show="xAxisData.length" v-loading="loadingTable" :x-axis-data="xAxisData" :data="data"
+        :gradient="false"
+        :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+        :grid="{
+          top: 50,
+          left: 30,
+          right: 30,
+          bottom: 20,
+          containLabel: true, // 是否包含坐标轴的刻度标签
+        }"
+      />
+      <el-empty v-show="!xAxisData.length" description="暂无数据" :image-size="100" />
+    </div>
   </table-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 4716d49..bd04e44 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -410,7 +410,7 @@
           <!-- 状态 -->
           <div
             v-if="column.text === '状态'" class="circle"
-            :class="scope.row.onlineState === '1' ? 'online' : 'offline'"
+            :class="scope.row.onlineState === '在线' ? 'online' : 'offline'"
           />
         </template>
         <template #columns>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 189edef..9642b1e 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -14,7 +14,7 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '网格编号', value: 'gridCode', align: 'center', isRequired: true, width: '150' },
-  { text: '管理单位', value: 'deptid', align: 'center', isRequired: true },
+  { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center' },
   { text: '负责人联系电话', value: 'telephone', align: 'center' },
   { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index ac58d24..af9225b 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -191,7 +191,11 @@
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible2" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+  <div v-show="dialogFormVisible2" class="dialog" :title="`${textMap[dialogStatus]}管线`" append-to-body>
+    <div class="header">
+      <span>{{ `${textMap[dialogStatus]}管线` }}</span>
+      <span class="close" @click="() => dialogFormVisible2 = false">x</span>
+    </div>
     <position-dialog ref="positionRef" @confirm="confirmPosition" />
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
@@ -279,7 +283,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产权单位" prop="propertyOwner">
-            <el-input v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;" clearable />
+            <el-input
+              v-model.trim="dataForm.propertyOwner" type="text" placeholder="产权单位" style="width: 100%;"
+              clearable
+            />
             <!-- <dept-select v-model="dataForm.propertyOwner" placeholder="产权单位" :clearable="true" style="width: 100%;" /> -->
           </el-form-item>
         </el-col>
@@ -294,17 +301,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="saveData">
-          确认
-        </el-button>
-        <el-button @click="cancel">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <div class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        确认
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -315,4 +320,40 @@
 .el-select {
   width: 100%;
 }
+
+.dialog {
+  width: 60%;
+  position: fixed;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1009;
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 5px !important;
+  border: 1px solid #e4e7ed;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  padding-top: 15px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px;
+    padding-bottom: 20px;
+
+    .close {
+      color: #817e7e;
+
+      &:hover {
+        color: #3d7eff;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: end;
+  }
+}
 </style>
diff --git a/src/views/home/operation/alarm/components/map.vue b/src/views/home/operation/alarm/components/map.vue
index f3cbbbe..d65f218 100644
--- a/src/views/home/operation/alarm/components/map.vue
+++ b/src/views/home/operation/alarm/components/map.vue
@@ -52,7 +52,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.data.position)
     const center = JSON.parse(JSON.stringify(data.data.position))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -81,7 +81,7 @@
     setTimeout(() => {
       // mapRef.value.map.setFitView()
       const center = JSON.parse(JSON.stringify(data.lnglat))
-      center[1] = Number(center[1]) + 0.0035
+      center[1] = Number(center[1]) + 0.0045
       mapRef.value.map.setCenter(center)
     })
     // mapRef.value.map.setCenter(data.lnglat)
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index feca4fe..6bf2151 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -190,7 +190,7 @@
     return
   }
   ElMessageBox.confirm(
-    '确定要删除选中的数据吗？',
+    '确定要处置选中的数据吗？',
     '确认操作',
     {
       confirmButtonText: '确定',
@@ -318,7 +318,7 @@
             <!-- 操作 -->
             <div>
               <el-button v-if="proxy.hasPerm('/alarm/device/delete')" type="primary" @click="batchDeleteRow">
-                批量删除
+                批量处置
               </el-button>
               <el-button v-if="proxy.hasPerm('/alarm/device/export')" type="primary" @click="exportList">
                 导出
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index e3a1913..a44fe4b 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -86,7 +86,7 @@
   },
   {
     text: '负责人',
-    value: '',
+    value: 'principal',
     align: 'center',
   },
   // {
diff --git a/src/views/home/pipeline/components/map.vue b/src/views/home/pipeline/components/map.vue
index c7c37be..abef23d 100644
--- a/src/views/home/pipeline/components/map.vue
+++ b/src/views/home/pipeline/components/map.vue
@@ -178,7 +178,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
   // 关联的管线高亮
@@ -223,7 +223,7 @@
     })
     // mapRef.value.map.setCenter(data.lnglat)
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/station/station/components/map.vue b/src/views/home/station/station/components/map.vue
index 1c5a64c..83a956f 100644
--- a/src/views/home/station/station/components/map.vue
+++ b/src/views/home/station/station/components/map.vue
@@ -142,7 +142,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -170,7 +170,7 @@
     // mapRef.value.map.setCenter(data.lnglat)
     // mapRef.value.map.setFitView()
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/well/components/detail.vue b/src/views/home/well/components/detail.vue
index 55f4f08..2a2d50e 100644
--- a/src/views/home/well/components/detail.vue
+++ b/src/views/home/well/components/detail.vue
@@ -65,16 +65,16 @@
     value: 'deptName',
     align: 'center',
   },
-  // {
-  //   text: '负责人',
-  //   value: '',
-  //   align: 'center',
-  // },
-  // {
-  //   text: '负责人联系方式',
-  //   value: '',
-  //   align: 'center',
-  // },
+  {
+    text: '负责人',
+    value: 'principal',
+    align: 'center',
+  },
+  {
+    text: '负责人联系方式',
+    value: '',
+    align: 'center',
+  },
   {
     text: '运行状态',
     value: 'validName',
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index a3f84a1..a9642f8 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -17,7 +17,7 @@
 const columns = ref<any>([
   { text: '报警时间', value: 'alarmTime', align: 'center' },
   { text: '报警类型', value: 'alarmTypeName', align: 'center' },
-  { text: '报警等级', value: 'alarmLevelName', align: 'center' },
+  { text: '报警等级', value: 'alarmLevel', align: 'center' },
   { text: '报警原因', value: 'alarmContent', align: 'center' },
   { text: '是否误报', value: 'realAlarm', align: 'center' },
   { text: '报警解除时间', value: 'cancelTime', align: 'center' },
diff --git a/src/views/home/well/components/map.vue b/src/views/home/well/components/map.vue
index 5d9ec48..80313b1 100644
--- a/src/views/home/well/components/map.vue
+++ b/src/views/home/well/components/map.vue
@@ -142,7 +142,7 @@
     // mapRef.value.map.setFitView()
     // mapRef.value.map.setCenter(data.event.data.lnglat)
     const center = JSON.parse(JSON.stringify(data.event.data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
@@ -168,7 +168,7 @@
       map: mapRef.value.map,
     })
     const center = JSON.parse(JSON.stringify(data.lnglat))
-    center[1] = Number(center[1]) + 0.0035
+    center[1] = Number(center[1]) + 0.0045
     mapRef.value.map.setCenter(center)
   })
 }
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index 04d4d59..0bf58f8 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -61,11 +61,11 @@
   getMonitorData(listQuery.value).then((res) => {
     list.value = res.data['燃气智能监测终端'] || []
     loadingTable.value = false
-    xAxisData.value = list.value.map((item: any) => item.logtime)
+    xAxisData.value = list.value.slice().reverse().map((item: any) => item.logtime)
     data.value = [
       {
         name: '燃气浓度',
-        data: list.value.map((item: any) => item.strength),
+        data: list.value.slice().reverse().map((item: any) => item.strength),
       },
     ]
   }).catch(() => {