diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index d3cc69a..c54b7f8 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -36,8 +36,8 @@
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '场站类型', value: 'wellTypeName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
-  { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
-  { text: '联系电话', value: 'telephone', align: 'center' },
+  // { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
+  // { text: '联系电话', value: 'telephone', align: 'center' },
   { text: '场站状态', value: 'onStateName', isRequired: true, align: 'center' },
   { text: '监控状态', value: 'monitorStateName', isRequired: true, align: 'center' },
   { text: '感知设备', value: 'deviceCount', align: 'center', width: '90' },

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index d3cc69a..c54b7f8 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -36,8 +36,8 @@
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '场站类型', value: 'wellTypeName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
-  { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
-  { text: '联系电话', value: 'telephone', align: 'center' },
+  // { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
+  // { text: '联系电话', value: 'telephone', align: 'center' },
   { text: '场站状态', value: 'onStateName', isRequired: true, align: 'center' },
   { text: '监控状态', value: 'monitorStateName', isRequired: true, align: 'center' },
   { text: '感知设备', value: 'deviceCount', align: 'center', width: '90' },
diff --git a/src/views/home/well/components/editDialog.vue b/src/views/home/well/components/editDialog.vue
index 5421d0d..1067b51 100644
--- a/src/views/home/well/components/editDialog.vue
+++ b/src/views/home/well/components/editDialog.vue
@@ -108,7 +108,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index d3cc69a..c54b7f8 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -36,8 +36,8 @@
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '场站类型', value: 'wellTypeName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
-  { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
-  { text: '联系电话', value: 'telephone', align: 'center' },
+  // { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
+  // { text: '联系电话', value: 'telephone', align: 'center' },
   { text: '场站状态', value: 'onStateName', isRequired: true, align: 'center' },
   { text: '监控状态', value: 'monitorStateName', isRequired: true, align: 'center' },
   { text: '感知设备', value: 'deviceCount', align: 'center', width: '90' },
diff --git a/src/views/home/well/components/editDialog.vue b/src/views/home/well/components/editDialog.vue
index 5421d0d..1067b51 100644
--- a/src/views/home/well/components/editDialog.vue
+++ b/src/views/home/well/components/editDialog.vue
@@ -108,7 +108,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index a0da5db..b803105 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -1116,7 +1116,7 @@
             <!-- 新建/既有 -->
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <!-- <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: 99px; left: 100px;z-index: 10;">
@@ -1145,7 +1145,7 @@
             placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: -4px; right: -80%;z-index: 10;">

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index d3cc69a..c54b7f8 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -36,8 +36,8 @@
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '场站类型', value: 'wellTypeName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
-  { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
-  { text: '联系电话', value: 'telephone', align: 'center' },
+  // { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
+  // { text: '联系电话', value: 'telephone', align: 'center' },
   { text: '场站状态', value: 'onStateName', isRequired: true, align: 'center' },
   { text: '监控状态', value: 'monitorStateName', isRequired: true, align: 'center' },
   { text: '感知设备', value: 'deviceCount', align: 'center', width: '90' },
diff --git a/src/views/home/well/components/editDialog.vue b/src/views/home/well/components/editDialog.vue
index 5421d0d..1067b51 100644
--- a/src/views/home/well/components/editDialog.vue
+++ b/src/views/home/well/components/editDialog.vue
@@ -108,7 +108,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index a0da5db..b803105 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -1116,7 +1116,7 @@
             <!-- 新建/既有 -->
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <!-- <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: 99px; left: 100px;z-index: 10;">
@@ -1145,7 +1145,7 @@
             placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: -4px; right: -80%;z-index: 10;">
diff --git a/src/views/mobile/record/search.vue b/src/views/mobile/record/search.vue
index 4b13887..84d085a 100644
--- a/src/views/mobile/record/search.vue
+++ b/src/views/mobile/record/search.vue
@@ -361,7 +361,7 @@
   getOperationListPage(obj).then(res => {
     total.value = res.data.total
     list.value = [...list.value, ...(res.data.rows || [])]
-    list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
+    // list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
     loading.value = false
   })
 }

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index d3cc69a..c54b7f8 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -36,8 +36,8 @@
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '场站类型', value: 'wellTypeName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
-  { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
-  { text: '联系电话', value: 'telephone', align: 'center' },
+  // { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
+  // { text: '联系电话', value: 'telephone', align: 'center' },
   { text: '场站状态', value: 'onStateName', isRequired: true, align: 'center' },
   { text: '监控状态', value: 'monitorStateName', isRequired: true, align: 'center' },
   { text: '感知设备', value: 'deviceCount', align: 'center', width: '90' },
diff --git a/src/views/home/well/components/editDialog.vue b/src/views/home/well/components/editDialog.vue
index 5421d0d..1067b51 100644
--- a/src/views/home/well/components/editDialog.vue
+++ b/src/views/home/well/components/editDialog.vue
@@ -108,7 +108,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index a0da5db..b803105 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -1116,7 +1116,7 @@
             <!-- 新建/既有 -->
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <!-- <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: 99px; left: 100px;z-index: 10;">
@@ -1145,7 +1145,7 @@
             placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: -4px; right: -80%;z-index: 10;">
diff --git a/src/views/mobile/record/search.vue b/src/views/mobile/record/search.vue
index 4b13887..84d085a 100644
--- a/src/views/mobile/record/search.vue
+++ b/src/views/mobile/record/search.vue
@@ -361,7 +361,7 @@
   getOperationListPage(obj).then(res => {
     total.value = res.data.total
     list.value = [...list.value, ...(res.data.rows || [])]
-    list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
+    // list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
     loading.value = false
   })
 }
diff --git a/src/views/system/expire/list.vue b/src/views/system/expire/list.vue
index 9a0497e..e6dde8c 100644
--- a/src/views/system/expire/list.vue
+++ b/src/views/system/expire/list.vue
@@ -55,7 +55,7 @@
             @change="changePage"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index d3cc69a..c54b7f8 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -36,8 +36,8 @@
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '场站类型', value: 'wellTypeName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
-  { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
-  { text: '联系电话', value: 'telephone', align: 'center' },
+  // { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
+  // { text: '联系电话', value: 'telephone', align: 'center' },
   { text: '场站状态', value: 'onStateName', isRequired: true, align: 'center' },
   { text: '监控状态', value: 'monitorStateName', isRequired: true, align: 'center' },
   { text: '感知设备', value: 'deviceCount', align: 'center', width: '90' },
diff --git a/src/views/home/well/components/editDialog.vue b/src/views/home/well/components/editDialog.vue
index 5421d0d..1067b51 100644
--- a/src/views/home/well/components/editDialog.vue
+++ b/src/views/home/well/components/editDialog.vue
@@ -108,7 +108,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index a0da5db..b803105 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -1116,7 +1116,7 @@
             <!-- 新建/既有 -->
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <!-- <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: 99px; left: 100px;z-index: 10;">
@@ -1145,7 +1145,7 @@
             placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: -4px; right: -80%;z-index: 10;">
diff --git a/src/views/mobile/record/search.vue b/src/views/mobile/record/search.vue
index 4b13887..84d085a 100644
--- a/src/views/mobile/record/search.vue
+++ b/src/views/mobile/record/search.vue
@@ -361,7 +361,7 @@
   getOperationListPage(obj).then(res => {
     total.value = res.data.total
     list.value = [...list.value, ...(res.data.rows || [])]
-    list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
+    // list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
     loading.value = false
   })
 }
diff --git a/src/views/system/expire/list.vue b/src/views/system/expire/list.vue
index 9a0497e..e6dde8c 100644
--- a/src/views/system/expire/list.vue
+++ b/src/views/system/expire/list.vue
@@ -55,7 +55,7 @@
             @change="changePage"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 64b9571..0a3bcc0 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -236,7 +236,7 @@
             @multi-select="multiSelect"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index d3cc69a..c54b7f8 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -36,8 +36,8 @@
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '场站类型', value: 'wellTypeName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
-  { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
-  { text: '联系电话', value: 'telephone', align: 'center' },
+  // { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
+  // { text: '联系电话', value: 'telephone', align: 'center' },
   { text: '场站状态', value: 'onStateName', isRequired: true, align: 'center' },
   { text: '监控状态', value: 'monitorStateName', isRequired: true, align: 'center' },
   { text: '感知设备', value: 'deviceCount', align: 'center', width: '90' },
diff --git a/src/views/home/well/components/editDialog.vue b/src/views/home/well/components/editDialog.vue
index 5421d0d..1067b51 100644
--- a/src/views/home/well/components/editDialog.vue
+++ b/src/views/home/well/components/editDialog.vue
@@ -108,7 +108,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index a0da5db..b803105 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -1116,7 +1116,7 @@
             <!-- 新建/既有 -->
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <!-- <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: 99px; left: 100px;z-index: 10;">
@@ -1145,7 +1145,7 @@
             placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: -4px; right: -80%;z-index: 10;">
diff --git a/src/views/mobile/record/search.vue b/src/views/mobile/record/search.vue
index 4b13887..84d085a 100644
--- a/src/views/mobile/record/search.vue
+++ b/src/views/mobile/record/search.vue
@@ -361,7 +361,7 @@
   getOperationListPage(obj).then(res => {
     total.value = res.data.total
     list.value = [...list.value, ...(res.data.rows || [])]
-    list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
+    // list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
     loading.value = false
   })
 }
diff --git a/src/views/system/expire/list.vue b/src/views/system/expire/list.vue
index 9a0497e..e6dde8c 100644
--- a/src/views/system/expire/list.vue
+++ b/src/views/system/expire/list.vue
@@ -55,7 +55,7 @@
             @change="changePage"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 64b9571..0a3bcc0 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -236,7 +236,7 @@
             @multi-select="multiSelect"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 95d32a4..3eff50d 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -315,7 +315,7 @@
             @multiSelect="selectionChange"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index d3cc69a..c54b7f8 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -36,8 +36,8 @@
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '场站类型', value: 'wellTypeName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
-  { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
-  { text: '联系电话', value: 'telephone', align: 'center' },
+  // { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
+  // { text: '联系电话', value: 'telephone', align: 'center' },
   { text: '场站状态', value: 'onStateName', isRequired: true, align: 'center' },
   { text: '监控状态', value: 'monitorStateName', isRequired: true, align: 'center' },
   { text: '感知设备', value: 'deviceCount', align: 'center', width: '90' },
diff --git a/src/views/home/well/components/editDialog.vue b/src/views/home/well/components/editDialog.vue
index 5421d0d..1067b51 100644
--- a/src/views/home/well/components/editDialog.vue
+++ b/src/views/home/well/components/editDialog.vue
@@ -108,7 +108,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index a0da5db..b803105 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -1116,7 +1116,7 @@
             <!-- 新建/既有 -->
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <!-- <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: 99px; left: 100px;z-index: 10;">
@@ -1145,7 +1145,7 @@
             placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: -4px; right: -80%;z-index: 10;">
diff --git a/src/views/mobile/record/search.vue b/src/views/mobile/record/search.vue
index 4b13887..84d085a 100644
--- a/src/views/mobile/record/search.vue
+++ b/src/views/mobile/record/search.vue
@@ -361,7 +361,7 @@
   getOperationListPage(obj).then(res => {
     total.value = res.data.total
     list.value = [...list.value, ...(res.data.rows || [])]
-    list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
+    // list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
     loading.value = false
   })
 }
diff --git a/src/views/system/expire/list.vue b/src/views/system/expire/list.vue
index 9a0497e..e6dde8c 100644
--- a/src/views/system/expire/list.vue
+++ b/src/views/system/expire/list.vue
@@ -55,7 +55,7 @@
             @change="changePage"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 64b9571..0a3bcc0 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -236,7 +236,7 @@
             @multi-select="multiSelect"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 95d32a4..3eff50d 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -315,7 +315,7 @@
             @multiSelect="selectionChange"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/system/signature/userListDialog.vue b/src/views/system/signature/userListDialog.vue
index 08a1e11..5ab0848 100644
--- a/src/views/system/signature/userListDialog.vue
+++ b/src/views/system/signature/userListDialog.vue
@@ -147,7 +147,7 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 665b61f..169ceab 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -17,7 +17,7 @@
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
-      ids: [id],
+      ids: id,
     },
   })
 }
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 1b923c9..6d88fc4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -173,7 +173,7 @@
           >
             <!-- 序号 -->
             <template #preColumns>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
index a188f98..6d43c4e 100644
--- a/src/components/dialog/selectStaffDialog.vue
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -208,7 +208,7 @@
                   <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/layouts/components/Tools/alarmDialog.vue b/src/layouts/components/Tools/alarmDialog.vue
index c748666..3785cad 100644
--- a/src/layouts/components/Tools/alarmDialog.vue
+++ b/src/layouts/components/Tools/alarmDialog.vue
@@ -14,7 +14,7 @@
 }
 const initDialog = (row: any) => {
   dialogFormVisible.value = true
-  const grade = `grade-${row.alarmLevel === '一级' ? '1' : row.alarmLevel === '二级' ? '2' : row.alarmLevel === '三级' ? '3' : 'other'}`
+  const grade = `grade-${row.alarmLevel === '报警' || row.alarmLevel === '一级' ? '1' : row.alarmLevel === '预警' || row.alarmLevel === '二级' ? '2'  : 'other'}`
   className.value = grade
   resetForm()
   info.value = JSON.parse(JSON.stringify(row))
diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue
index 6423da4..9b77deb 100644
--- a/src/layouts/components/Tools/alarmList.vue
+++ b/src/layouts/components/Tools/alarmList.vue
@@ -233,7 +233,7 @@
             <div class="title" :title="`${message.alarmType}${message.alarmTime}`">
               <div class="container">
                 <div
-                  :class="`mar circle circle-${message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
+                  :class="`mar circle circle-${message.alarmLevelName.includes('报警') || message.alarmLevelName.includes('一级') ? '1' : message.alarmLevelName.includes('预警') || message.alarmLevelName.includes('二级') ? '2' : message.alarmLevelName.includes('三级') ? '3' : 'other'}`">
                   22
                 </div>
                 <div class="mar mar1">
diff --git a/src/utils/structure.ts b/src/utils/structure.ts
index fde6619..830e6ae 100644
--- a/src/utils/structure.ts
+++ b/src/utils/structure.ts
@@ -132,7 +132,7 @@
  * @param plainList 寻找列表中的父id
  * @returns 父id列表
  */
-function findPid(plainList: Array<ArrayItem>): Array<string> {
+export function findPid(plainList: Array<ArrayItem>): Array<string> {
   const pidList = new Set<string>()
   if (plainList) {
     for (const item of plainList) { // 1.添加所有的父id
diff --git a/src/views/home/alarm/count/index.vue b/src/views/home/alarm/count/index.vue
index 1317575..7369e41 100644
--- a/src/views/home/alarm/count/index.vue
+++ b/src/views/home/alarm/count/index.vue
@@ -18,10 +18,11 @@
     <overall-alarm />
     <!-- 各类报警统计 -->
     <alarm-statistics style="margin-top: 10px;" />
-    <!-- 报警趋势分析 -->
-    <trend-analysis style="margin-top: 10px;" />
     <!-- 各单位报警统计 -->
     <dept-count style="margin-top: 10px;" />
+    <!-- 报警趋势分析 -->
+    <trend-analysis style="margin-top: 10px;" />
+
     <!-- 异常位置分析 -->
     <location-analysis style="margin-top: 10px;" />
   </app-container>
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 814a1ee..3f170fd 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -159,7 +159,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index a66f430..ffe98fa 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -193,7 +193,7 @@
           rightVibrateAlarm: String(item.rightVibrateAlarm) === '1' || String(item.rightVibrateAlarm) === '0' ? dict[String(item.rightVibrateAlarm)] : item.rightVibrateAlarm,
         }))
       }
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map(item => item.uptime)
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
diff --git a/src/views/home/alarm/current/components/handlerDialog.vue b/src/views/home/alarm/current/components/handlerDialog.vue
index 555a066..c4e30ad 100644
--- a/src/views/home/alarm/current/components/handlerDialog.vue
+++ b/src/views/home/alarm/current/components/handlerDialog.vue
@@ -101,7 +101,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index f2611a7..a3e66a3 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -92,7 +92,7 @@
       setTimeout(() => {
         loadingTable.value = false
       }, 1500);
-      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.logtime)
+      xAxisData.value = JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => item.uptime)
       const indexDict = {
         1: '一',
         2: '二',
diff --git a/src/views/home/alarm/current/components/pendingDialog.vue b/src/views/home/alarm/current/components/pendingDialog.vue
index 87ab710..9f93f8c 100644
--- a/src/views/home/alarm/current/components/pendingDialog.vue
+++ b/src/views/home/alarm/current/components/pendingDialog.vue
@@ -104,7 +104,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/components/remindDialog.vue b/src/views/home/alarm/current/components/remindDialog.vue
index 8b020b3..978c261 100644
--- a/src/views/home/alarm/current/components/remindDialog.vue
+++ b/src/views/home/alarm/current/components/remindDialog.vue
@@ -193,7 +193,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 1315fc9..b407a43 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -394,7 +394,7 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级'  ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -742,7 +742,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 767da42..01ccfd0 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -39,12 +39,12 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
-  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110' },
+  { text: '报警类别', value: 'alarmCategory', align: 'center', width: '110', isRequired: false },
   { text: '报警类型', value: 'alarmType', align: 'center', width: '140' },
   { text: '报警原因', value: 'alarmReason', align: 'center' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '90' },
   { text: '位置', value: 'position', align: 'center' },
-  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '130', isCustom: true, isRequired: false },
   { text: '管理单位', value: 'deptName', align: 'center' },
   // { text: '是否误报', value: 'realAlarmName', align: 'center', width: '90' },
   { text: '报警时间', value: 'alarmTime', align: 'center' },
@@ -295,11 +295,11 @@
           <el-option v-for="item in deviceTypeList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-select v-model="listQuery.realAlarm" placeholder="是否误报" clearable class="select" style="width: 192px;">
           <el-option v-for="item in realAlarmList" :key="item.id" :value="item.value" :label="item.name" />
         </el-select>
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="位置" clearable />
       </search-item>
@@ -336,7 +336,7 @@
                <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
              </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index d965170..dba1d86 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -90,12 +90,16 @@
     二级: '#ee9611',
     三级: '#ffd700',
     其他: '#8dc6ea',
+    报警: '#f56c6c',
+    预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
     一级: `${publicPath}/image/other/one-icon.png`,
     二级: `${publicPath}/image/other/two-icon.png`,
     三级: `${publicPath}/image/other/three-icon.png`,
     其他: `${publicPath}/image/other/other-icon.png`,
+    报警: `${publicPath}/image/other/one-icon.png`,
+    预警: `${publicPath}/image/other/two-icon.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -157,6 +161,20 @@
         zIndex: 99,
         type: '其他',
       },
+      {
+        url: `${publicPath}/image/other/one.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '报警',
+      },
+      {
+        url: `${publicPath}/image/other/two.png`,
+        anchor: new mapRef.value.AMap.Pixel(4, 4),
+        size: new mapRef.value.AMap.Size(18, 18),
+        zIndex: 99,
+        type: '预警',
+      },
     ]
     legendData.value.forEach((item: any) => {
       drawMarker(
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index 3893e3d..f767c0f 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -204,7 +204,7 @@
               :list-loading="loadingTable" @change="changePage"
             >
               <template #preColumns>
-                <el-table-column label="序号" width="70" align="center">
+                <el-table-column label="序号" width="80" align="center">
                   <template #default="scope">
                     {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                   </template>
diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index 70d7cf9..1724d3a 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -479,7 +479,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" v-loaing="disabledBtn" :disabled="disabledBtn" @click="saveData">
+        <el-button type="primary" v-loading="disabledBtn" :disabled="disabledBtn" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/device/components/alarmRecord.vue b/src/views/home/device/device/components/alarmRecord.vue
index b2e8b47..95764d9 100644
--- a/src/views/home/device/device/components/alarmRecord.vue
+++ b/src/views/home/device/device/components/alarmRecord.vue
@@ -118,7 +118,7 @@
     </template>
     <normal-table
       :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300"
+      :pagination="false" :height="390"
     >
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/controlRecord.vue b/src/views/home/device/device/components/controlRecord.vue
index 8509c94..1adced6 100644
--- a/src/views/home/device/device/components/controlRecord.vue
+++ b/src/views/home/device/device/components/controlRecord.vue
@@ -10,6 +10,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { instructionProductList } from '@/views/home/device/instruction/components/instruction'
 import { getProductListPage } from '@/api/home/device/product'
+import { ElMessage } from 'element-plus'
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
@@ -19,6 +20,7 @@
 const deviceTypeList = ref<any[]>([])
 const productAllList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
 const productList = ref<{ id: string; name: string; value: string }[]>([]) // 产品
+const support = ref<any[]>([]) // 产品
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
@@ -141,14 +143,24 @@
 // 新建控制记录
 const $router = useRouter()
 const addControl = () => {
-  const data = JSON.parse($route.query.row as string)
-  // console.log(data, 'data')
+  // const data = JSON.parse($route.query.row as string)
+  // // console.log(data, 'data')
+  // const typeName = data.devTypeName || data.typeName || data.deviceType || data.devTypeName
+  // const product = productAllList.value.filter((item) => item.deviceTypeName === typeName)
+  // // console.log(product, 'product')
+  // if (product.length && support.value.filter(item => item.id === product[0]?.id).length) {
+  // 判断该设备是否符合指令下发标准
   $router.push({
     path: '/device/instruction',
     query: {
       row: $route.query.row,
     },
   })
+  // }
+  // else {
+  //   ElMessage.warning('该设备不支持指令下发')
+  // }
+
 }
 // 获取字典
 const fetchDict = async () => {
@@ -168,6 +180,13 @@
     id: item.id,
     value: item.id,
   }))
+  const productConfig = instructionProductList
+  support.value = res1.data.rows.filter((item: any) => productConfig.some((citem: any) => item.manufacturerName.includes(citem.manufacturerName) && item.deviceTypeName.includes(citem.deviceName))).map((item: any) => ({
+    ...item,
+    name: `${item.productName}-${item.deviceModel}/${item.manufacturerName}`,
+    id: item.id,
+    value: item.id,
+  }))
 }
 
 onMounted(async () => {
@@ -197,7 +216,7 @@
       </el-button>
     </template>
     <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-      :pagination="false" :height="300">
+      :pagination="false" :height="390">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
           <template #default="scope">
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 5bada69..e802cd7 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -453,7 +453,7 @@
 
       </div>
     </template>
-    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="300"
+    <normal-table v-if="showTable" :data="list" :total="0" :columns="columns" :query="listQuery" :height="390"
       :list-loading="loadingTable" :pagination="false">
       <template #preColumns>
         <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/home/device/device/components/detail copy.vue b/src/views/home/device/device/components/detail copy.vue
new file mode 100644
index 0000000..a813c0f
--- /dev/null
+++ b/src/views/home/device/device/components/detail copy.vue
@@ -0,0 +1,180 @@
+<!--
+  Description: 设备管理-详情
+  Author: 李亚光
+  Date: 2023-09-03
+ -->
+<script lang="ts" setup name="WellDetail">
+import dayjs from 'dayjs'
+import { ElMessage } from 'element-plus'
+import detailData from './detailData.vue'
+import showPosition from './showPosition.vue'
+import { getDeviceTypeListPage } from '@/api/home/device/type'
+import { getDeviceListPage } from '@/api/home/device/device'
+const $router = useRouter()
+const $route = useRoute()
+// 页面详情数据
+const detailInfo = ref<{ [key: string]: string }>({})
+// 描述列表数据
+const descriptionsList = ref([
+  {
+    text: '设备编号',
+    value: 'devcode',
+    align: 'center',
+  },
+  {
+    text: '设备类型',
+    value: 'deviceTypeName',
+    align: 'center',
+  },
+  {
+    text: '设备型号',
+    value: 'deviceModel',
+    align: 'center',
+  },
+  {
+    text: '设备厂商',
+    value: 'manufactureName',
+    align: 'center',
+  },
+  {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center',
+  },
+  {
+    text: '管理单位',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '详细位置',
+    value: 'position',
+    align: 'center',
+  },
+  {
+    text: '经纬度',
+    value: 'lnglat',
+    align: 'center',
+  },
+  {
+    text: '安装日期',
+    value: 'installDate',
+    align: 'center',
+  },
+  {
+    text: '在用状态',
+    value: 'validName',
+    align: 'center',
+  },
+])
+
+// 页面loading
+const loading = ref(true)
+// 获取闸井详情数据
+const fetchWellDetail = () => {
+  loading.value = true
+  getDeviceTypeListPage({ offset: 1, limit: 99999 }).then(async (res) => {
+    try {
+      const row = await getDeviceListPage({ offset: 1, limit: 999, devCode: JSON.parse($route.query.row as string).devcode })
+      detailInfo.value = row.data.rows[0] || {}
+      detailInfo.value.installDate = dayjs(row.data.rows[0]?.installDate || '').format('YYYY-MM-DD')
+
+      detailInfo.value.lnglat = detailInfo.value.lng ? `${detailInfo.value.lng},${detailInfo.value.lat}` : ''
+      detailInfo.value.deviceTypeName = res.data.rows.filter((item: any) => item.id === detailInfo.value.deviceType)[0]?.typeName || detailInfo.value.devTypeName || ''
+      loading.value = false
+      if (detailInfo.value.deviceTypeName === '燃气监测桩' || detailInfo.value.deviceTypeName === '智能警示桩') {
+        descriptionsList.value.push(
+          {
+            text: '左侧指示带长度',
+            value: 'leftLength',
+            align: 'center',
+          },
+        )
+        descriptionsList.value.push(
+          {
+            text: '右侧指示带长度',
+            value: 'rightLength',
+            align: 'center',
+          },
+        )
+      }
+      descriptionsList.value.push(
+        {
+          text: '备注',
+          value: 'remark',
+          align: 'center',
+        })
+    }
+    catch (err) {
+      loading.value = false
+    }
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 点击经纬度展示地图
+const mapRef = ref()
+const showMap = (data: any) => {
+  if (data.text !== '经纬度' || !detailInfo.value[data.value]) {
+    return
+  }
+  if (!detailInfo.value.lng || !detailInfo.value.lat) {
+    ElMessage.warning('该数据缺少坐标信息')
+    return
+  }
+  mapRef.value.initDialog([detailInfo.value.lng, detailInfo.value.lat])
+}
+onMounted(() => {
+  fetchWellDetail()
+})
+</script>
+
+<template>
+  <!-- 布局 -->
+  <app-container v-loading="loading" class="container">
+    <!-- 地图展示位置弹窗 -->
+    <show-position ref="mapRef" />
+    <!-- <detail-page title="设备详情">
+      <template #btns>
+        <el-button type="info" @click="$router.back()">
+          关闭
+        </el-button>
+      </template>
+    </detail-page> -->
+    <detail-block-com>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+          <template #label>
+            <span class="label">
+              {{ item.text }}
+            </span>
+          </template>
+          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+            {{ detailInfo[item.value] || '' }}
+          </span>
+        </el-descriptions-item>
+      </el-descriptions>
+    </detail-block-com>
+    <detail-block-com>
+      <detail-data />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+::v-deep(.el-descriptions__label) {
+  width: 15%;
+}
+
+::v-deep(.el-descriptions__content) {
+  width: 35%;
+}
+
+.pointer {
+  color: #0d76d4;
+  &:hover {
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/home/device/device/components/detail.vue b/src/views/home/device/device/components/detail.vue
index a813c0f..9a320ec 100644
--- a/src/views/home/device/device/components/detail.vue
+++ b/src/views/home/device/device/components/detail.vue
@@ -135,29 +135,26 @@
   <app-container v-loading="loading" class="container">
     <!-- 地图展示位置弹窗 -->
     <show-position ref="mapRef" />
-    <!-- <detail-page title="设备详情">
-      <template #btns>
-        <el-button type="info" @click="$router.back()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page> -->
     <detail-block-com>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
-          <template #label>
-            <span class="label">
-              {{ item.text }}
-            </span>
-          </template>
-          <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
-            {{ detailInfo[item.value] || '' }}
-          </span>
-        </el-descriptions-item>
-      </el-descriptions>
-    </detail-block-com>
-    <detail-block-com>
-      <detail-data />
+      <div style="display: flex;width: 100%;justify-content: space-between;">
+        <div style="width: 75%;">
+          <detail-data />
+        </div>
+        <div style="width: 24%;padding-top: 40px;">
+          <el-descriptions :column="1" border>
+            <el-descriptions-item v-for="item in descriptionsList" :key="item.text" :align="item.align">
+              <template #label>
+                <span class="label">
+                  {{ item.text }}
+                </span>
+              </template>
+              <span :class="`${item.text === '经纬度' ? 'pointer' : ''}`" @click="showMap(item)">
+                {{ detailInfo[item.value] || '' }}
+              </span>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
     </detail-block-com>
   </app-container>
 </template>
@@ -173,6 +170,7 @@
 
 .pointer {
   color: #0d76d4;
+
   &:hover {
     cursor: pointer;
   }
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index bb98035..a1e1244 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -95,7 +95,7 @@
         </div>
       </template>
       <normal-table :data="list" :total="0" :columns="columns" :query="listQuery" :list-loading="loadingTable"
-        :pagination="false" :height="300">
+        :pagination="false" :height="390">
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
             <template #default="scope">
@@ -105,7 +105,7 @@
         </template>
       </normal-table>
     </table-container>
-    <div style="width: 50%;height: 360px;">
+    <div style="width: 50%;height: 420px;">
       <line-chart v-show="list.length" :loading="loadingTable" :x-axis-data="xAxisData" unit="%" :data="data"
         :gradient="false" :smooth="false"
         :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '60', top: '10' }"
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 8dd38d8..618ea0b 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -491,7 +491,7 @@
     </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/instruction/components/editDialog.vue b/src/views/home/device/instruction/components/editDialog.vue
index 72ee2e5..ffc556a 100644
--- a/src/views/home/device/instruction/components/editDialog.vue
+++ b/src/views/home/device/instruction/components/editDialog.vue
@@ -850,7 +850,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-if="!disabledInstruction" v-loaing="disabledBtn" :disabled="disabledBtn" type="primary"
+        <el-button v-if="!disabledInstruction" v-loading="disabledBtn" :disabled="disabledBtn" type="primary"
           @click="saveData">
           确认
         </el-button>
@@ -859,7 +859,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 3c7c340..01a02da 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -374,7 +374,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 13a3a2a..6f46271 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -275,7 +275,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 284de27..48aea78 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -177,7 +177,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/type/components/editDialog.vue b/src/views/home/device/type/components/editDialog.vue
index da20109..37559c2 100644
--- a/src/views/home/device/type/components/editDialog.vue
+++ b/src/views/home/device/type/components/editDialog.vue
@@ -192,7 +192,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 46ef2b9..2f9bb56 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -143,7 +143,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index fc5f8ab..eae19ff 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -154,7 +154,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index be22c62..3487ee3 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -174,7 +174,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/location/components/addDialog.vue b/src/views/home/ledger/location/components/addDialog.vue
index 5167f36..c2e0d9b 100644
--- a/src/views/home/ledger/location/components/addDialog.vue
+++ b/src/views/home/ledger/location/components/addDialog.vue
@@ -212,7 +212,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/components/editDialog.vue b/src/views/home/ledger/pipeline/components/editDialog.vue
index 0b4568a..fdc0c01 100644
--- a/src/views/home/ledger/pipeline/components/editDialog.vue
+++ b/src/views/home/ledger/pipeline/components/editDialog.vue
@@ -309,7 +309,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/ledger/pipeline/index.vue b/src/views/home/ledger/pipeline/index.vue
index 1b91e42..211bb8a 100644
--- a/src/views/home/ledger/pipeline/index.vue
+++ b/src/views/home/ledger/pipeline/index.vue
@@ -304,7 +304,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index afa75f2..a82667e 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -155,7 +155,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/service/index.vue b/src/views/home/monitor/service/index.vue
index 1ae3f22..e591962 100644
--- a/src/views/home/monitor/service/index.vue
+++ b/src/views/home/monitor/service/index.vue
@@ -82,7 +82,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/monitor/time/index.vue b/src/views/home/monitor/time/index.vue
index 4493784..9e1cabf 100644
--- a/src/views/home/monitor/time/index.vue
+++ b/src/views/home/monitor/time/index.vue
@@ -78,7 +78,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index b909083..502da6b 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: $route.query.type === 'history' ? info.alarmTime : info.ts, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index f13eaf9..81891e2 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -519,7 +519,7 @@
             :is-showmulti-select="proxy.hasPerm('/alarm/device/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index af6c736..5a91b37 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -141,7 +141,7 @@
   alarmProcessNode($route.query.id as string).then((res) => {
     alarmDynamics.value = res.data.map((item: any) => ({ ...toHumpObject(item) }))
     alarmDynamics.value.unshift({
-      approvalTime: info.ts, // 报警生成时间
+      approvalTime: info.alarmTime, // 报警生成时间
       process_name: '',
       approvalPerson: '报警生成',
       dept_name: '',
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index fb28efe..2566892 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -272,7 +272,7 @@
                 <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
               </template>
   </el-table-column> -->
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 5c7d2fe..7601775 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -203,7 +203,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index b7ee3f5..ae99169 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -168,7 +168,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/pipeline/components/detail.vue b/src/views/home/pipeline/components/detail.vue
index 3d8b9ee..1c161d5 100644
--- a/src/views/home/pipeline/components/detail.vue
+++ b/src/views/home/pipeline/components/detail.vue
@@ -65,36 +65,36 @@
     value: 'latGaode',
     align: 'center',
   },
-  {
-    text: '关联管线',
-    value: 'manageType',
-    align: 'center',
-  },
+  // {
+  //   text: '关联管线',
+  //   value: 'manageType',
+  //   align: 'center',
+  // },
   {
     text: '管理方式',
     value: 'manageType',
     align: 'center',
   },
-  {
-    text: '管径(mm)',
-    value: 'pipeDiameter',
-    align: 'center',
-  },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center',
-  },
-  {
-    text: '建设年代',
-    value: 'constructEra',
-    align: 'center',
-  },
-  {
-    text: '管线材质',
-    value: 'material',
-    align: 'center',
-  },
+  // {
+  //   text: '管径(mm)',
+  //   value: 'pipeDiameter',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '建设年代',
+  //   value: 'constructEra',
+  //   align: 'center',
+  // },
+  // {
+  //   text: '管线材质',
+  //   value: 'material',
+  //   align: 'center',
+  // },
   {
     text: '负责人',
     value: 'personName',
@@ -115,6 +115,11 @@
     value: 'monitorStateName',
     align: 'center',
   },
+  {
+    text: '',
+    value: '',
+    align: 'center',
+  },
 ])
 const showDeviceTips = ref(false) // 展示设备编号提示
 // 页面loading
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 707b4de..cf57a9d 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,11 +32,11 @@
   { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
-  { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
-  { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
-  { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
-  { text: '管材', value: 'material', isRequired: true, align: 'center' },
-  { text: '建设年代', value: 'constructEra', align: 'center' },
+  // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
+  // { text: '压力级制', value: 'pressType', isRequired: true, align: 'center' },
+  // { text: '管径(mm)', value: 'pipeDiameter', align: 'center' },
+  // { text: '管材', value: 'material', isRequired: true, align: 'center' },
+  // { text: '建设年代', value: 'constructEra', align: 'center' },
   { text: '详细位置', value: 'position', isRequired: true, align: 'center' },
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '在用状态', value: 'onState', align: 'center', width: '90' },
@@ -478,9 +478,9 @@
       <search-item>
         <dept-select v-model="listQuery.deptId" placeholder="管理单位" :clearable="true" style="width: 160px !important;" />
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.pipeCode" placeholder="关联管线" clearable style="width: 160px !important;" />
-      </search-item>
+      </search-item> -->
       <search-item>
         <el-input v-model.trim="listQuery.position" placeholder="详细位置" clearable style="width: 160px !important;" />
       </search-item>
diff --git a/src/views/home/rule/agreement/components/editDialog.vue b/src/views/home/rule/agreement/components/editDialog.vue
index 27632bf..894e6a1 100644
--- a/src/views/home/rule/agreement/components/editDialog.vue
+++ b/src/views/home/rule/agreement/components/editDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index f1cfe15..242ec84 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -131,7 +131,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmLevelList.vue b/src/views/home/rule/alarm/components/alarmLevelList.vue
index 94c053b..3c7da74 100644
--- a/src/views/home/rule/alarm/components/alarmLevelList.vue
+++ b/src/views/home/rule/alarm/components/alarmLevelList.vue
@@ -114,7 +114,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/alarmTypeList.vue b/src/views/home/rule/alarm/components/alarmTypeList.vue
index d2d62b3..4b793f3 100644
--- a/src/views/home/rule/alarm/components/alarmTypeList.vue
+++ b/src/views/home/rule/alarm/components/alarmTypeList.vue
@@ -105,7 +105,7 @@
       <normal-table :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
index 8683d3d..e30f66f 100644
--- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue
@@ -184,7 +184,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
index 039f9a4..ab1b5f6 100644
--- a/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
+++ b/src/views/home/rule/alarm/components/editAlarmTypeDialog.vue
@@ -190,7 +190,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/components/editDialog.vue b/src/views/home/rule/alarm/components/editDialog.vue
index f37822d..83ee7d1 100644
--- a/src/views/home/rule/alarm/components/editDialog.vue
+++ b/src/views/home/rule/alarm/components/editDialog.vue
@@ -376,7 +376,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 4e8a125..1219817 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -280,7 +280,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/rule/special/components/editDialog.vue b/src/views/home/rule/special/components/editDialog.vue
index e362c0d..04b11a0 100644
--- a/src/views/home/rule/special/components/editDialog.vue
+++ b/src/views/home/rule/special/components/editDialog.vue
@@ -399,6 +399,9 @@
 const computeOptions = (val: any) => {
   return val.map((item: any) => ({ label: `${item.value}-${item.name}`, value: item.value }))
 }
+const computeTypeName = computed(() => {
+  return productList.value.filter((item) => item.id === dataForm.value.productId)[0]?.name || ''
+})
 </script>
 
 <template>
@@ -489,7 +492,9 @@
                       <div v-if="item.type === 'input'" style="width: 100%;">
                         <el-input v-model.trim="scope.row[item.value]" placeholder="报警阈值" clearable type="number"
                           style="width: 60%;" :disabled="!scope.row.edit || !scope.row.isConcentration" />
-                        <span>{{ scope.row.isConcentration ? "%LEL" : "" }}</span>
+                        <span>{{ scope.row.isConcentration ?
+                        computeTypeName.includes('云台') ? 'PPM.M'
+                        : "%LEL" : "" }}</span>
                       </div>
                     </template>
                   </el-table-column>
@@ -519,7 +524,7 @@
     </el-form>
     <template #footer>
       <div v-if="dialogStatus !== 'detail'" class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
@@ -527,7 +532,7 @@
         </el-button>
       </div>
       <div v-else class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="cancel">
           确认
         </el-button>
       </div>
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 1c61f9f..df6075d 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.id).then(() => {
+    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -139,7 +139,7 @@
       <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
         @change="changePage">
         <template #preColumns>
-          <el-table-column label="序号" width="70" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index 1de57e3..e3f3173 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -72,7 +72,7 @@
   if (data.id.includes('station')) {
     // 点击的设备(加载视频)
     // console.log(data, '点击')
-    const deviceCode = data.DEVICECODE
+    const deviceCode = data.DEVCODE
     // const deviceCode = 'WXD7507'
     if (deviceCode) {
       loading.value = true
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 4f2c96c..694cc3c 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -179,7 +179,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/station/station/components/editDialog.vue b/src/views/home/station/station/components/editDialog.vue
index 7b002e7..ef73d28 100644
--- a/src/views/home/station/station/components/editDialog.vue
+++ b/src/views/home/station/station/components/editDialog.vue
@@ -107,7 +107,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index d3cc69a..c54b7f8 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -36,8 +36,8 @@
   { text: '管理单位', value: 'deptName', isRequired: true, align: 'center' },
   { text: '场站类型', value: 'wellTypeName', isRequired: true, align: 'center' },
   { text: '详细位置', value: 'position', align: 'center' },
-  { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
-  { text: '联系电话', value: 'telephone', align: 'center' },
+  // { text: '负责人', value: 'personName', isRequired: true, align: 'center' },
+  // { text: '联系电话', value: 'telephone', align: 'center' },
   { text: '场站状态', value: 'onStateName', isRequired: true, align: 'center' },
   { text: '监控状态', value: 'monitorStateName', isRequired: true, align: 'center' },
   { text: '感知设备', value: 'deviceCount', align: 'center', width: '90' },
diff --git a/src/views/home/well/components/editDialog.vue b/src/views/home/well/components/editDialog.vue
index 5421d0d..1067b51 100644
--- a/src/views/home/well/components/editDialog.vue
+++ b/src/views/home/well/components/editDialog.vue
@@ -108,7 +108,7 @@
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-loaing="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
+        <el-button v-loading="disabledBtn" :disabled="disabledBtn" type="primary" @click="saveData">
           确认
         </el-button>
         <el-button @click="cancel">
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index a0da5db..b803105 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -1116,7 +1116,7 @@
             <!-- 新建/既有 -->
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <!-- <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: 99px; left: 100px;z-index: 10;">
@@ -1145,7 +1145,7 @@
             placeholder="请输入安装位号" required input-align="right" :rules="[{ required: true, message: '请输入安装位置' }]">
             <template #label>
               <span style="position: relative;">
-                设备编号
+                安装位置
                 <template v-if="deviceInfo.watchObject !== '2'">
                   <div id="tag-flag" v-if="addType === '新建'"
                     style="position: absolute;top: -4px; right: -80%;z-index: 10;">
diff --git a/src/views/mobile/record/search.vue b/src/views/mobile/record/search.vue
index 4b13887..84d085a 100644
--- a/src/views/mobile/record/search.vue
+++ b/src/views/mobile/record/search.vue
@@ -361,7 +361,7 @@
   getOperationListPage(obj).then(res => {
     total.value = res.data.total
     list.value = [...list.value, ...(res.data.rows || [])]
-    list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
+    // list.value = list.value.map((item: any) => ({ ...item, repairTime: item.repairTime ? dayjs().format('YYYY-MM-DD') : '' }))
     loading.value = false
   })
 }
diff --git a/src/views/system/expire/list.vue b/src/views/system/expire/list.vue
index 9a0497e..e6dde8c 100644
--- a/src/views/system/expire/list.vue
+++ b/src/views/system/expire/list.vue
@@ -55,7 +55,7 @@
             @change="changePage"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index 64b9571..0a3bcc0 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -236,7 +236,7 @@
             @multi-select="multiSelect"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index 95d32a4..3eff50d 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -315,7 +315,7 @@
             @multiSelect="selectionChange"
           >
             <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
+              <el-table-column label="序号" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
diff --git a/src/views/system/signature/userListDialog.vue b/src/views/system/signature/userListDialog.vue
index 08a1e11..5ab0848 100644
--- a/src/views/system/signature/userListDialog.vue
+++ b/src/views/system/signature/userListDialog.vue
@@ -147,7 +147,7 @@
         :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="#" width="55" align="center">
+          <el-table-column label="#" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index 1e00753..aa20b2b 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -336,7 +336,7 @@
                   <el-radio v-model="select" :label="scope.$index + 1" class="radio" />
                 </template>
               </el-table-column>
-              <el-table-column label="#" width="55" align="center">
+              <el-table-column label="#" width="80" align="center">
                 <template #default="scope">
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>