diff --git a/src/api/index.ts b/src/api/index.ts
index c44d085..fb47f1a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout')) {
+      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',

diff --git a/src/api/index.ts b/src/api/index.ts
index c44d085..fb47f1a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout')) {
+      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/components/VirtualTable/index.vue b/src/components/VirtualTable/index.vue
index a7a15cf..76f7d10 100644
--- a/src/components/VirtualTable/index.vue
+++ b/src/components/VirtualTable/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格
+  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格 文档地址：https://vxeui.com/#/start/install
   Author: 李亚光
   Date: 2025-04-15
  -->

diff --git a/src/api/index.ts b/src/api/index.ts
index c44d085..fb47f1a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout')) {
+      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/components/VirtualTable/index.vue b/src/components/VirtualTable/index.vue
index a7a15cf..76f7d10 100644
--- a/src/components/VirtualTable/index.vue
+++ b/src/components/VirtualTable/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格
+  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格 文档地址：https://vxeui.com/#/start/install
   Author: 李亚光
   Date: 2025-04-15
  -->
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index dfe3a07..199a47a 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -165,7 +165,7 @@
 // 去挂起
 const pendingRef = ref()
 const pending = () => {
-  if (!dataForm.value.confirmValue) {
+  if (!dataForm.value.confirmValue && info.value.alarmCategory?.includes('浓度')) {
     ElMessage.warning('现场浓度值不能为空')
     return
   }

diff --git a/src/api/index.ts b/src/api/index.ts
index c44d085..fb47f1a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout')) {
+      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/components/VirtualTable/index.vue b/src/components/VirtualTable/index.vue
index a7a15cf..76f7d10 100644
--- a/src/components/VirtualTable/index.vue
+++ b/src/components/VirtualTable/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格
+  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格 文档地址：https://vxeui.com/#/start/install
   Author: 李亚光
   Date: 2025-04-15
  -->
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index dfe3a07..199a47a 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -165,7 +165,7 @@
 // 去挂起
 const pendingRef = ref()
 const pending = () => {
-  if (!dataForm.value.confirmValue) {
+  if (!dataForm.value.confirmValue && info.value.alarmCategory?.includes('浓度')) {
     ElMessage.warning('现场浓度值不能为空')
     return
   }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 9edd699..4572d68 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -83,11 +83,11 @@
     value: 'personName',
     align: 'center',
   },
-  {
-    text: '是否误报',
-    value: 'realAlarmName',
-    align: 'center',
-  },
+  // {
+  //   text: '是否误报',
+  //   value: 'realAlarmName',
+  //   align: 'center',
+  // },
   {
     text: '解除时间',
     value: 'cancelTime',
@@ -98,13 +98,13 @@
     value: 'duration',
     align: 'center',
   },
-  {
-    text: '',
-    value: '',
-    align: '',
-  },
+  // {
+  //   text: '',
+  //   value: '',
+  //   align: '',
+  // },
 ])
-if($route.query.type === 'history') {
+if ($route.query.type === 'history') {
   descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
 }
 // 报警动态
@@ -139,6 +139,13 @@
     else {
       detailInfo.value.alarmReason = (alarmValue[detailInfo.value.alarmValue] || '其他')
     }
+    if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度')) {
+      descriptionsList.value = descriptionsList.value.filter(item => item.text !== '详细地址')
+      descriptionsList.value.push({
+        text: '',
+        value: ''
+      })
+    }
     // 查询设备类型和厂商
     getDeviceListPage({ offset: 1, limit: 1, devCode: detailInfo.value.devcode }).then(res => {
       if (res.data.rows.length) {
@@ -168,6 +175,17 @@
       ...item,
       approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
     }))
+    alarmDynamics.value.forEach((item: any) => {
+      if (item.descn) {
+        if (item.process_name === '挂起') {
+          item.descn = `挂起时长：${item.descn.split('|')[0] || ''}${item.descn.split('|')[0] ? '小时' : ''} ；
+            挂起原因：${item.descn.split('|')[1] || ''}；`
+        }
+        else {
+          item.descn = `内容：${item.descn}`
+        }
+      }
+    })
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -176,7 +194,10 @@
 // 点击经纬度展示地图
 const mapRef = ref()
 const { proxy } = getCurrentInstance() as any
-const showMap = (data: any) => {
+const showMap = (data: any, skip: boolean) => {
+  if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度') && data.text === '位置' && !skip) {
+    return
+  }
   // console.log(data, 'data')
   if (data.text === '设备编号') {
     // JSON.parse($route.query.row as string).devcode
@@ -288,15 +309,27 @@
           </template>
           <span
             :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
-            @click="showMap(item)">
+            @click="showMap(item, false)">
             <el-tooltip v-if="showDeviceTips && item.text === '设备编号'" class="box-item" effect="dark"
               :content="`${deviceTips.typeName}(${deviceTips.manufactureName})`" placement="top">
               {{ detailInfo[item.value] || '' }}
             </el-tooltip>
-            <template v-else>{{ detailInfo[item.value] || '' }}
-              <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
-              <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
-                size="small" @click="viewData">查看数据</el-button>
+            <template v-else>
+              <template
+                v-if="item.text === '位置' && !detailInfo.alarmCategory?.includes('浓度') && !detailInfo.alarmTypeName?.includes('浓度')">
+                <el-popconfirm confirm-button-text="地图点位" cancel-button-text="安装位置" icon-color="#626AEF"
+                  title="选择查看内容?" @confirm="showMap({...item, text: '详细地址'}, true)" @cancel="showMap({...item, text: '位置'}, true)" width="180">
+                  <template #reference>
+                    {{ detailInfo[item.value] || '' }}
+                  </template>
+                </el-popconfirm>
+              </template>
+              <template v-else>
+                {{ detailInfo[item.value] || '' }}
+                <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
+                <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
+                  size="small" @click="viewData">查看数据</el-button>
+              </template>
             </template>
           </span>
         </el-descriptions-item>
@@ -310,8 +343,9 @@
             <el-timeline>
               <el-timeline-item v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
                 type="primary">
-                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
-                  ''}${item.process_name}` }}
+                <div>{{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
+                  ''}${item.process_name}` }}</div>
+                <div v-if="item.descn">{{ item.descn }}</div>
               </el-timeline-item>
             </el-timeline>
           </div>
@@ -352,4 +386,10 @@
     --el-descriptions-table-border-top: none;
   }
 }
+
+::v-deep(.el-popconfirm__action) {
+  .el-popconfirm__action{
+    background-color: #0d76d4;
+  }
+}
 </style>

diff --git a/src/api/index.ts b/src/api/index.ts
index c44d085..fb47f1a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout')) {
+      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/components/VirtualTable/index.vue b/src/components/VirtualTable/index.vue
index a7a15cf..76f7d10 100644
--- a/src/components/VirtualTable/index.vue
+++ b/src/components/VirtualTable/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格
+  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格 文档地址：https://vxeui.com/#/start/install
   Author: 李亚光
   Date: 2025-04-15
  -->
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index dfe3a07..199a47a 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -165,7 +165,7 @@
 // 去挂起
 const pendingRef = ref()
 const pending = () => {
-  if (!dataForm.value.confirmValue) {
+  if (!dataForm.value.confirmValue && info.value.alarmCategory?.includes('浓度')) {
     ElMessage.warning('现场浓度值不能为空')
     return
   }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 9edd699..4572d68 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -83,11 +83,11 @@
     value: 'personName',
     align: 'center',
   },
-  {
-    text: '是否误报',
-    value: 'realAlarmName',
-    align: 'center',
-  },
+  // {
+  //   text: '是否误报',
+  //   value: 'realAlarmName',
+  //   align: 'center',
+  // },
   {
     text: '解除时间',
     value: 'cancelTime',
@@ -98,13 +98,13 @@
     value: 'duration',
     align: 'center',
   },
-  {
-    text: '',
-    value: '',
-    align: '',
-  },
+  // {
+  //   text: '',
+  //   value: '',
+  //   align: '',
+  // },
 ])
-if($route.query.type === 'history') {
+if ($route.query.type === 'history') {
   descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
 }
 // 报警动态
@@ -139,6 +139,13 @@
     else {
       detailInfo.value.alarmReason = (alarmValue[detailInfo.value.alarmValue] || '其他')
     }
+    if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度')) {
+      descriptionsList.value = descriptionsList.value.filter(item => item.text !== '详细地址')
+      descriptionsList.value.push({
+        text: '',
+        value: ''
+      })
+    }
     // 查询设备类型和厂商
     getDeviceListPage({ offset: 1, limit: 1, devCode: detailInfo.value.devcode }).then(res => {
       if (res.data.rows.length) {
@@ -168,6 +175,17 @@
       ...item,
       approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
     }))
+    alarmDynamics.value.forEach((item: any) => {
+      if (item.descn) {
+        if (item.process_name === '挂起') {
+          item.descn = `挂起时长：${item.descn.split('|')[0] || ''}${item.descn.split('|')[0] ? '小时' : ''} ；
+            挂起原因：${item.descn.split('|')[1] || ''}；`
+        }
+        else {
+          item.descn = `内容：${item.descn}`
+        }
+      }
+    })
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -176,7 +194,10 @@
 // 点击经纬度展示地图
 const mapRef = ref()
 const { proxy } = getCurrentInstance() as any
-const showMap = (data: any) => {
+const showMap = (data: any, skip: boolean) => {
+  if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度') && data.text === '位置' && !skip) {
+    return
+  }
   // console.log(data, 'data')
   if (data.text === '设备编号') {
     // JSON.parse($route.query.row as string).devcode
@@ -288,15 +309,27 @@
           </template>
           <span
             :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
-            @click="showMap(item)">
+            @click="showMap(item, false)">
             <el-tooltip v-if="showDeviceTips && item.text === '设备编号'" class="box-item" effect="dark"
               :content="`${deviceTips.typeName}(${deviceTips.manufactureName})`" placement="top">
               {{ detailInfo[item.value] || '' }}
             </el-tooltip>
-            <template v-else>{{ detailInfo[item.value] || '' }}
-              <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
-              <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
-                size="small" @click="viewData">查看数据</el-button>
+            <template v-else>
+              <template
+                v-if="item.text === '位置' && !detailInfo.alarmCategory?.includes('浓度') && !detailInfo.alarmTypeName?.includes('浓度')">
+                <el-popconfirm confirm-button-text="地图点位" cancel-button-text="安装位置" icon-color="#626AEF"
+                  title="选择查看内容?" @confirm="showMap({...item, text: '详细地址'}, true)" @cancel="showMap({...item, text: '位置'}, true)" width="180">
+                  <template #reference>
+                    {{ detailInfo[item.value] || '' }}
+                  </template>
+                </el-popconfirm>
+              </template>
+              <template v-else>
+                {{ detailInfo[item.value] || '' }}
+                <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
+                <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
+                  size="small" @click="viewData">查看数据</el-button>
+              </template>
             </template>
           </span>
         </el-descriptions-item>
@@ -310,8 +343,9 @@
             <el-timeline>
               <el-timeline-item v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
                 type="primary">
-                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
-                  ''}${item.process_name}` }}
+                <div>{{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
+                  ''}${item.process_name}` }}</div>
+                <div v-if="item.descn">{{ item.descn }}</div>
               </el-timeline-item>
             </el-timeline>
           </div>
@@ -352,4 +386,10 @@
     --el-descriptions-table-border-top: none;
   }
 }
+
+::v-deep(.el-popconfirm__action) {
+  .el-popconfirm__action{
+    background-color: #0d76d4;
+  }
+}
 </style>
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 87324cb..ae1a319 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -334,14 +334,14 @@
           {{ info?.address }}
         </span>
       </div> -->
-      <div v-if="type === 'data'" class="item">
+      <div v-if="type === 'data' || type === 'device'" class="item">
         位置:
         <span style="padding-left: 6px;" class="more" @click="goDetailWell">
           {{ info?.address }}
           <!-- {{ `${info.ledgerNumber} ${info.ledgerNumber ? '|' : ''}${info.ledgerName}` }} -->
         </span>
       </div>
-      <div v-if="type === 'device' || (type === 'data' && info.alarmCategory?.includes('浓度'))" class="item">
+      <div v-if="(type === 'data' && info.alarmCategory?.includes('浓度'))|| type === 'device' " class="item">
         详细地址:
         <span style="padding-left: 6px;">
           {{ info.position }}

diff --git a/src/api/index.ts b/src/api/index.ts
index c44d085..fb47f1a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout')) {
+      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/components/VirtualTable/index.vue b/src/components/VirtualTable/index.vue
index a7a15cf..76f7d10 100644
--- a/src/components/VirtualTable/index.vue
+++ b/src/components/VirtualTable/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格
+  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格 文档地址：https://vxeui.com/#/start/install
   Author: 李亚光
   Date: 2025-04-15
  -->
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index dfe3a07..199a47a 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -165,7 +165,7 @@
 // 去挂起
 const pendingRef = ref()
 const pending = () => {
-  if (!dataForm.value.confirmValue) {
+  if (!dataForm.value.confirmValue && info.value.alarmCategory?.includes('浓度')) {
     ElMessage.warning('现场浓度值不能为空')
     return
   }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 9edd699..4572d68 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -83,11 +83,11 @@
     value: 'personName',
     align: 'center',
   },
-  {
-    text: '是否误报',
-    value: 'realAlarmName',
-    align: 'center',
-  },
+  // {
+  //   text: '是否误报',
+  //   value: 'realAlarmName',
+  //   align: 'center',
+  // },
   {
     text: '解除时间',
     value: 'cancelTime',
@@ -98,13 +98,13 @@
     value: 'duration',
     align: 'center',
   },
-  {
-    text: '',
-    value: '',
-    align: '',
-  },
+  // {
+  //   text: '',
+  //   value: '',
+  //   align: '',
+  // },
 ])
-if($route.query.type === 'history') {
+if ($route.query.type === 'history') {
   descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
 }
 // 报警动态
@@ -139,6 +139,13 @@
     else {
       detailInfo.value.alarmReason = (alarmValue[detailInfo.value.alarmValue] || '其他')
     }
+    if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度')) {
+      descriptionsList.value = descriptionsList.value.filter(item => item.text !== '详细地址')
+      descriptionsList.value.push({
+        text: '',
+        value: ''
+      })
+    }
     // 查询设备类型和厂商
     getDeviceListPage({ offset: 1, limit: 1, devCode: detailInfo.value.devcode }).then(res => {
       if (res.data.rows.length) {
@@ -168,6 +175,17 @@
       ...item,
       approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
     }))
+    alarmDynamics.value.forEach((item: any) => {
+      if (item.descn) {
+        if (item.process_name === '挂起') {
+          item.descn = `挂起时长：${item.descn.split('|')[0] || ''}${item.descn.split('|')[0] ? '小时' : ''} ；
+            挂起原因：${item.descn.split('|')[1] || ''}；`
+        }
+        else {
+          item.descn = `内容：${item.descn}`
+        }
+      }
+    })
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -176,7 +194,10 @@
 // 点击经纬度展示地图
 const mapRef = ref()
 const { proxy } = getCurrentInstance() as any
-const showMap = (data: any) => {
+const showMap = (data: any, skip: boolean) => {
+  if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度') && data.text === '位置' && !skip) {
+    return
+  }
   // console.log(data, 'data')
   if (data.text === '设备编号') {
     // JSON.parse($route.query.row as string).devcode
@@ -288,15 +309,27 @@
           </template>
           <span
             :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
-            @click="showMap(item)">
+            @click="showMap(item, false)">
             <el-tooltip v-if="showDeviceTips && item.text === '设备编号'" class="box-item" effect="dark"
               :content="`${deviceTips.typeName}(${deviceTips.manufactureName})`" placement="top">
               {{ detailInfo[item.value] || '' }}
             </el-tooltip>
-            <template v-else>{{ detailInfo[item.value] || '' }}
-              <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
-              <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
-                size="small" @click="viewData">查看数据</el-button>
+            <template v-else>
+              <template
+                v-if="item.text === '位置' && !detailInfo.alarmCategory?.includes('浓度') && !detailInfo.alarmTypeName?.includes('浓度')">
+                <el-popconfirm confirm-button-text="地图点位" cancel-button-text="安装位置" icon-color="#626AEF"
+                  title="选择查看内容?" @confirm="showMap({...item, text: '详细地址'}, true)" @cancel="showMap({...item, text: '位置'}, true)" width="180">
+                  <template #reference>
+                    {{ detailInfo[item.value] || '' }}
+                  </template>
+                </el-popconfirm>
+              </template>
+              <template v-else>
+                {{ detailInfo[item.value] || '' }}
+                <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
+                <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
+                  size="small" @click="viewData">查看数据</el-button>
+              </template>
             </template>
           </span>
         </el-descriptions-item>
@@ -310,8 +343,9 @@
             <el-timeline>
               <el-timeline-item v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
                 type="primary">
-                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
-                  ''}${item.process_name}` }}
+                <div>{{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
+                  ''}${item.process_name}` }}</div>
+                <div v-if="item.descn">{{ item.descn }}</div>
               </el-timeline-item>
             </el-timeline>
           </div>
@@ -352,4 +386,10 @@
     --el-descriptions-table-border-top: none;
   }
 }
+
+::v-deep(.el-popconfirm__action) {
+  .el-popconfirm__action{
+    background-color: #0d76d4;
+  }
+}
 </style>
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 87324cb..ae1a319 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -334,14 +334,14 @@
           {{ info?.address }}
         </span>
       </div> -->
-      <div v-if="type === 'data'" class="item">
+      <div v-if="type === 'data' || type === 'device'" class="item">
         位置:
         <span style="padding-left: 6px;" class="more" @click="goDetailWell">
           {{ info?.address }}
           <!-- {{ `${info.ledgerNumber} ${info.ledgerNumber ? '|' : ''}${info.ledgerName}` }} -->
         </span>
       </div>
-      <div v-if="type === 'device' || (type === 'data' && info.alarmCategory?.includes('浓度'))" class="item">
+      <div v-if="(type === 'data' && info.alarmCategory?.includes('浓度'))|| type === 'device' " class="item">
         详细地址:
         <span style="padding-left: 6px;">
           {{ info.position }}
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index e8afa0c..b21f678 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -29,16 +29,16 @@
   },
   {
     name: '确认人员',
-    procrssNames: ['已确认'],
-    processCode: ['5'],
+    procrssNames: ['已确认', '待处置'],
+    processCode: ['5', '6'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 3,
   },
   {
     name: '处置人员',
-    procrssNames: ['待处置', '已处置'],
-    processCode: ['6', '7'],
+    procrssNames: ['已处置'],
+    processCode: ['7'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 4,
@@ -46,7 +46,7 @@
   {
     name: '设备正常',
     procrssNames: ['已处置'],
-    processCode: ['7','10', '8'],
+    processCode: ['7', '10', '8'],
     icon0: '设备-0',
     icon1: '设备-1',
     active: 5,
@@ -54,7 +54,7 @@
   {
     name: '结束',
     procrssNames: ['已处置'],
-    processCode: ['7','10'],
+    processCode: ['7', '10'],
     icon0: '结束',
     icon1: '结束',
     active: 6,
@@ -91,18 +91,16 @@
 // 初始化对话框
 const loading = ref(true)
 const initDialog = (row: any) => {
-  // console.log(row, 'row')
   dialogFormVisible.value = true
   loading.value = true
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
-      res.data =res.data.map((item:any) => ({
+      res.data = res.data.map((item: any) => ({
         ...item,
         APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
         NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
       }))
-      // console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -116,45 +114,41 @@
         })
         active.value = 3
         processData.value = processData.value.map((item, index) => ({ ...item, active: index + 1 }))
-        // console.log(processData.value, 'processData.value')
-        // 处理content
         // 已读
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
-        <span>时间: ${already[0].APPROVAL_TIME}</span></br>
         <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
+        <span>时间: ${already[0].APPROVAL_TIME}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
-        <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
         <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
+        <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
-        <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
+        <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         <span>剩余时长: ${computedDuartion(pending[0].APPROVAL_TIME, pending[0].DESCN?.split('|')[0])}</span></br>
         `
-        // console.log(processData.value, ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, 'data')
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            // console.log(1111)
-            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
-        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
+        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容:
 
@@ -165,8 +159,8 @@
             }
             else {
               processData.value[cindex].content = `
-        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
+        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
@@ -203,6 +197,17 @@
       }
       // console.log(processData.value, 'processDataprocessData')
     }
+    // console.log(processData, 'processData')
+    processData.value.forEach((item, index) => {
+      if (item.content) {
+        const str = item.content
+        const regex = /(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/;
+        const match = str.match(regex);
+        if (match) {
+          item.time = match[1]
+        }
+      }
+    })
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -241,7 +246,10 @@
             </div>
           </template>
           <template #description>
-            <span>{{ item.person }}</span>
+            <!-- <span>{{ item.person }}</span> -->
+            <div v-if="item.person">{{ item.person }}</div>
+            <div v-if="!item.person" style="opacity: 0;">111</div>
+            <div style="white-space: nowrap">{{ item.time }}</div>
           </template>
         </el-step>
       </el-steps>

diff --git a/src/api/index.ts b/src/api/index.ts
index c44d085..fb47f1a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout')) {
+      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/components/VirtualTable/index.vue b/src/components/VirtualTable/index.vue
index a7a15cf..76f7d10 100644
--- a/src/components/VirtualTable/index.vue
+++ b/src/components/VirtualTable/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格
+  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格 文档地址：https://vxeui.com/#/start/install
   Author: 李亚光
   Date: 2025-04-15
  -->
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index dfe3a07..199a47a 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -165,7 +165,7 @@
 // 去挂起
 const pendingRef = ref()
 const pending = () => {
-  if (!dataForm.value.confirmValue) {
+  if (!dataForm.value.confirmValue && info.value.alarmCategory?.includes('浓度')) {
     ElMessage.warning('现场浓度值不能为空')
     return
   }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 9edd699..4572d68 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -83,11 +83,11 @@
     value: 'personName',
     align: 'center',
   },
-  {
-    text: '是否误报',
-    value: 'realAlarmName',
-    align: 'center',
-  },
+  // {
+  //   text: '是否误报',
+  //   value: 'realAlarmName',
+  //   align: 'center',
+  // },
   {
     text: '解除时间',
     value: 'cancelTime',
@@ -98,13 +98,13 @@
     value: 'duration',
     align: 'center',
   },
-  {
-    text: '',
-    value: '',
-    align: '',
-  },
+  // {
+  //   text: '',
+  //   value: '',
+  //   align: '',
+  // },
 ])
-if($route.query.type === 'history') {
+if ($route.query.type === 'history') {
   descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
 }
 // 报警动态
@@ -139,6 +139,13 @@
     else {
       detailInfo.value.alarmReason = (alarmValue[detailInfo.value.alarmValue] || '其他')
     }
+    if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度')) {
+      descriptionsList.value = descriptionsList.value.filter(item => item.text !== '详细地址')
+      descriptionsList.value.push({
+        text: '',
+        value: ''
+      })
+    }
     // 查询设备类型和厂商
     getDeviceListPage({ offset: 1, limit: 1, devCode: detailInfo.value.devcode }).then(res => {
       if (res.data.rows.length) {
@@ -168,6 +175,17 @@
       ...item,
       approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
     }))
+    alarmDynamics.value.forEach((item: any) => {
+      if (item.descn) {
+        if (item.process_name === '挂起') {
+          item.descn = `挂起时长：${item.descn.split('|')[0] || ''}${item.descn.split('|')[0] ? '小时' : ''} ；
+            挂起原因：${item.descn.split('|')[1] || ''}；`
+        }
+        else {
+          item.descn = `内容：${item.descn}`
+        }
+      }
+    })
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -176,7 +194,10 @@
 // 点击经纬度展示地图
 const mapRef = ref()
 const { proxy } = getCurrentInstance() as any
-const showMap = (data: any) => {
+const showMap = (data: any, skip: boolean) => {
+  if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度') && data.text === '位置' && !skip) {
+    return
+  }
   // console.log(data, 'data')
   if (data.text === '设备编号') {
     // JSON.parse($route.query.row as string).devcode
@@ -288,15 +309,27 @@
           </template>
           <span
             :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
-            @click="showMap(item)">
+            @click="showMap(item, false)">
             <el-tooltip v-if="showDeviceTips && item.text === '设备编号'" class="box-item" effect="dark"
               :content="`${deviceTips.typeName}(${deviceTips.manufactureName})`" placement="top">
               {{ detailInfo[item.value] || '' }}
             </el-tooltip>
-            <template v-else>{{ detailInfo[item.value] || '' }}
-              <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
-              <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
-                size="small" @click="viewData">查看数据</el-button>
+            <template v-else>
+              <template
+                v-if="item.text === '位置' && !detailInfo.alarmCategory?.includes('浓度') && !detailInfo.alarmTypeName?.includes('浓度')">
+                <el-popconfirm confirm-button-text="地图点位" cancel-button-text="安装位置" icon-color="#626AEF"
+                  title="选择查看内容?" @confirm="showMap({...item, text: '详细地址'}, true)" @cancel="showMap({...item, text: '位置'}, true)" width="180">
+                  <template #reference>
+                    {{ detailInfo[item.value] || '' }}
+                  </template>
+                </el-popconfirm>
+              </template>
+              <template v-else>
+                {{ detailInfo[item.value] || '' }}
+                <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
+                <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
+                  size="small" @click="viewData">查看数据</el-button>
+              </template>
             </template>
           </span>
         </el-descriptions-item>
@@ -310,8 +343,9 @@
             <el-timeline>
               <el-timeline-item v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
                 type="primary">
-                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
-                  ''}${item.process_name}` }}
+                <div>{{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
+                  ''}${item.process_name}` }}</div>
+                <div v-if="item.descn">{{ item.descn }}</div>
               </el-timeline-item>
             </el-timeline>
           </div>
@@ -352,4 +386,10 @@
     --el-descriptions-table-border-top: none;
   }
 }
+
+::v-deep(.el-popconfirm__action) {
+  .el-popconfirm__action{
+    background-color: #0d76d4;
+  }
+}
 </style>
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 87324cb..ae1a319 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -334,14 +334,14 @@
           {{ info?.address }}
         </span>
       </div> -->
-      <div v-if="type === 'data'" class="item">
+      <div v-if="type === 'data' || type === 'device'" class="item">
         位置:
         <span style="padding-left: 6px;" class="more" @click="goDetailWell">
           {{ info?.address }}
           <!-- {{ `${info.ledgerNumber} ${info.ledgerNumber ? '|' : ''}${info.ledgerName}` }} -->
         </span>
       </div>
-      <div v-if="type === 'device' || (type === 'data' && info.alarmCategory?.includes('浓度'))" class="item">
+      <div v-if="(type === 'data' && info.alarmCategory?.includes('浓度'))|| type === 'device' " class="item">
         详细地址:
         <span style="padding-left: 6px;">
           {{ info.position }}
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index e8afa0c..b21f678 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -29,16 +29,16 @@
   },
   {
     name: '确认人员',
-    procrssNames: ['已确认'],
-    processCode: ['5'],
+    procrssNames: ['已确认', '待处置'],
+    processCode: ['5', '6'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 3,
   },
   {
     name: '处置人员',
-    procrssNames: ['待处置', '已处置'],
-    processCode: ['6', '7'],
+    procrssNames: ['已处置'],
+    processCode: ['7'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 4,
@@ -46,7 +46,7 @@
   {
     name: '设备正常',
     procrssNames: ['已处置'],
-    processCode: ['7','10', '8'],
+    processCode: ['7', '10', '8'],
     icon0: '设备-0',
     icon1: '设备-1',
     active: 5,
@@ -54,7 +54,7 @@
   {
     name: '结束',
     procrssNames: ['已处置'],
-    processCode: ['7','10'],
+    processCode: ['7', '10'],
     icon0: '结束',
     icon1: '结束',
     active: 6,
@@ -91,18 +91,16 @@
 // 初始化对话框
 const loading = ref(true)
 const initDialog = (row: any) => {
-  // console.log(row, 'row')
   dialogFormVisible.value = true
   loading.value = true
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
-      res.data =res.data.map((item:any) => ({
+      res.data = res.data.map((item: any) => ({
         ...item,
         APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
         NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
       }))
-      // console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -116,45 +114,41 @@
         })
         active.value = 3
         processData.value = processData.value.map((item, index) => ({ ...item, active: index + 1 }))
-        // console.log(processData.value, 'processData.value')
-        // 处理content
         // 已读
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
-        <span>时间: ${already[0].APPROVAL_TIME}</span></br>
         <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
+        <span>时间: ${already[0].APPROVAL_TIME}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
-        <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
         <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
+        <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
-        <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
+        <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         <span>剩余时长: ${computedDuartion(pending[0].APPROVAL_TIME, pending[0].DESCN?.split('|')[0])}</span></br>
         `
-        // console.log(processData.value, ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, 'data')
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            // console.log(1111)
-            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
-        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
+        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容:
 
@@ -165,8 +159,8 @@
             }
             else {
               processData.value[cindex].content = `
-        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
+        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
@@ -203,6 +197,17 @@
       }
       // console.log(processData.value, 'processDataprocessData')
     }
+    // console.log(processData, 'processData')
+    processData.value.forEach((item, index) => {
+      if (item.content) {
+        const str = item.content
+        const regex = /(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/;
+        const match = str.match(regex);
+        if (match) {
+          item.time = match[1]
+        }
+      }
+    })
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -241,7 +246,10 @@
             </div>
           </template>
           <template #description>
-            <span>{{ item.person }}</span>
+            <!-- <span>{{ item.person }}</span> -->
+            <div v-if="item.person">{{ item.person }}</div>
+            <div v-if="!item.person" style="opacity: 0;">111</div>
+            <div style="white-space: nowrap">{{ item.time }}</div>
           </template>
         </el-step>
       </el-steps>
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 9740f68..e701d2e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -23,6 +23,7 @@
   upEndTime: '',
 })
 const deviceTypeList = ref<any[]>([])
+const isFirst = ref(true)
 // 时间查询条件
 const timerangForCollect = ref<string[]>([])
 const timerangForReport = ref<string[]>([])
@@ -261,6 +262,12 @@
       }
     }))
   }
+  if (listQuery.value.typeName.includes('云台') && isFirst.value) {
+    timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+    listQuery.value.logBegTime = dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss')
+    listQuery.value.logEndTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  isFirst.value = false
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
     // if (listQuery.value.typeName === '智能警示桩') {
@@ -401,6 +408,8 @@
   getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     deviceTypeList.value = res.data.rows
     setColumn()
+
+
     fetchData()
   })
 })

diff --git a/src/api/index.ts b/src/api/index.ts
index c44d085..fb47f1a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout')) {
+      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/components/VirtualTable/index.vue b/src/components/VirtualTable/index.vue
index a7a15cf..76f7d10 100644
--- a/src/components/VirtualTable/index.vue
+++ b/src/components/VirtualTable/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格
+  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格 文档地址：https://vxeui.com/#/start/install
   Author: 李亚光
   Date: 2025-04-15
  -->
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index dfe3a07..199a47a 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -165,7 +165,7 @@
 // 去挂起
 const pendingRef = ref()
 const pending = () => {
-  if (!dataForm.value.confirmValue) {
+  if (!dataForm.value.confirmValue && info.value.alarmCategory?.includes('浓度')) {
     ElMessage.warning('现场浓度值不能为空')
     return
   }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 9edd699..4572d68 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -83,11 +83,11 @@
     value: 'personName',
     align: 'center',
   },
-  {
-    text: '是否误报',
-    value: 'realAlarmName',
-    align: 'center',
-  },
+  // {
+  //   text: '是否误报',
+  //   value: 'realAlarmName',
+  //   align: 'center',
+  // },
   {
     text: '解除时间',
     value: 'cancelTime',
@@ -98,13 +98,13 @@
     value: 'duration',
     align: 'center',
   },
-  {
-    text: '',
-    value: '',
-    align: '',
-  },
+  // {
+  //   text: '',
+  //   value: '',
+  //   align: '',
+  // },
 ])
-if($route.query.type === 'history') {
+if ($route.query.type === 'history') {
   descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
 }
 // 报警动态
@@ -139,6 +139,13 @@
     else {
       detailInfo.value.alarmReason = (alarmValue[detailInfo.value.alarmValue] || '其他')
     }
+    if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度')) {
+      descriptionsList.value = descriptionsList.value.filter(item => item.text !== '详细地址')
+      descriptionsList.value.push({
+        text: '',
+        value: ''
+      })
+    }
     // 查询设备类型和厂商
     getDeviceListPage({ offset: 1, limit: 1, devCode: detailInfo.value.devcode }).then(res => {
       if (res.data.rows.length) {
@@ -168,6 +175,17 @@
       ...item,
       approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
     }))
+    alarmDynamics.value.forEach((item: any) => {
+      if (item.descn) {
+        if (item.process_name === '挂起') {
+          item.descn = `挂起时长：${item.descn.split('|')[0] || ''}${item.descn.split('|')[0] ? '小时' : ''} ；
+            挂起原因：${item.descn.split('|')[1] || ''}；`
+        }
+        else {
+          item.descn = `内容：${item.descn}`
+        }
+      }
+    })
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -176,7 +194,10 @@
 // 点击经纬度展示地图
 const mapRef = ref()
 const { proxy } = getCurrentInstance() as any
-const showMap = (data: any) => {
+const showMap = (data: any, skip: boolean) => {
+  if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度') && data.text === '位置' && !skip) {
+    return
+  }
   // console.log(data, 'data')
   if (data.text === '设备编号') {
     // JSON.parse($route.query.row as string).devcode
@@ -288,15 +309,27 @@
           </template>
           <span
             :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
-            @click="showMap(item)">
+            @click="showMap(item, false)">
             <el-tooltip v-if="showDeviceTips && item.text === '设备编号'" class="box-item" effect="dark"
               :content="`${deviceTips.typeName}(${deviceTips.manufactureName})`" placement="top">
               {{ detailInfo[item.value] || '' }}
             </el-tooltip>
-            <template v-else>{{ detailInfo[item.value] || '' }}
-              <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
-              <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
-                size="small" @click="viewData">查看数据</el-button>
+            <template v-else>
+              <template
+                v-if="item.text === '位置' && !detailInfo.alarmCategory?.includes('浓度') && !detailInfo.alarmTypeName?.includes('浓度')">
+                <el-popconfirm confirm-button-text="地图点位" cancel-button-text="安装位置" icon-color="#626AEF"
+                  title="选择查看内容?" @confirm="showMap({...item, text: '详细地址'}, true)" @cancel="showMap({...item, text: '位置'}, true)" width="180">
+                  <template #reference>
+                    {{ detailInfo[item.value] || '' }}
+                  </template>
+                </el-popconfirm>
+              </template>
+              <template v-else>
+                {{ detailInfo[item.value] || '' }}
+                <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
+                <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
+                  size="small" @click="viewData">查看数据</el-button>
+              </template>
             </template>
           </span>
         </el-descriptions-item>
@@ -310,8 +343,9 @@
             <el-timeline>
               <el-timeline-item v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
                 type="primary">
-                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
-                  ''}${item.process_name}` }}
+                <div>{{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
+                  ''}${item.process_name}` }}</div>
+                <div v-if="item.descn">{{ item.descn }}</div>
               </el-timeline-item>
             </el-timeline>
           </div>
@@ -352,4 +386,10 @@
     --el-descriptions-table-border-top: none;
   }
 }
+
+::v-deep(.el-popconfirm__action) {
+  .el-popconfirm__action{
+    background-color: #0d76d4;
+  }
+}
 </style>
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 87324cb..ae1a319 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -334,14 +334,14 @@
           {{ info?.address }}
         </span>
       </div> -->
-      <div v-if="type === 'data'" class="item">
+      <div v-if="type === 'data' || type === 'device'" class="item">
         位置:
         <span style="padding-left: 6px;" class="more" @click="goDetailWell">
           {{ info?.address }}
           <!-- {{ `${info.ledgerNumber} ${info.ledgerNumber ? '|' : ''}${info.ledgerName}` }} -->
         </span>
       </div>
-      <div v-if="type === 'device' || (type === 'data' && info.alarmCategory?.includes('浓度'))" class="item">
+      <div v-if="(type === 'data' && info.alarmCategory?.includes('浓度'))|| type === 'device' " class="item">
         详细地址:
         <span style="padding-left: 6px;">
           {{ info.position }}
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index e8afa0c..b21f678 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -29,16 +29,16 @@
   },
   {
     name: '确认人员',
-    procrssNames: ['已确认'],
-    processCode: ['5'],
+    procrssNames: ['已确认', '待处置'],
+    processCode: ['5', '6'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 3,
   },
   {
     name: '处置人员',
-    procrssNames: ['待处置', '已处置'],
-    processCode: ['6', '7'],
+    procrssNames: ['已处置'],
+    processCode: ['7'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 4,
@@ -46,7 +46,7 @@
   {
     name: '设备正常',
     procrssNames: ['已处置'],
-    processCode: ['7','10', '8'],
+    processCode: ['7', '10', '8'],
     icon0: '设备-0',
     icon1: '设备-1',
     active: 5,
@@ -54,7 +54,7 @@
   {
     name: '结束',
     procrssNames: ['已处置'],
-    processCode: ['7','10'],
+    processCode: ['7', '10'],
     icon0: '结束',
     icon1: '结束',
     active: 6,
@@ -91,18 +91,16 @@
 // 初始化对话框
 const loading = ref(true)
 const initDialog = (row: any) => {
-  // console.log(row, 'row')
   dialogFormVisible.value = true
   loading.value = true
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
-      res.data =res.data.map((item:any) => ({
+      res.data = res.data.map((item: any) => ({
         ...item,
         APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
         NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
       }))
-      // console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -116,45 +114,41 @@
         })
         active.value = 3
         processData.value = processData.value.map((item, index) => ({ ...item, active: index + 1 }))
-        // console.log(processData.value, 'processData.value')
-        // 处理content
         // 已读
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
-        <span>时间: ${already[0].APPROVAL_TIME}</span></br>
         <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
+        <span>时间: ${already[0].APPROVAL_TIME}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
-        <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
         <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
+        <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
-        <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
+        <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         <span>剩余时长: ${computedDuartion(pending[0].APPROVAL_TIME, pending[0].DESCN?.split('|')[0])}</span></br>
         `
-        // console.log(processData.value, ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, 'data')
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            // console.log(1111)
-            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
-        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
+        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容:
 
@@ -165,8 +159,8 @@
             }
             else {
               processData.value[cindex].content = `
-        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
+        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
@@ -203,6 +197,17 @@
       }
       // console.log(processData.value, 'processDataprocessData')
     }
+    // console.log(processData, 'processData')
+    processData.value.forEach((item, index) => {
+      if (item.content) {
+        const str = item.content
+        const regex = /(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/;
+        const match = str.match(regex);
+        if (match) {
+          item.time = match[1]
+        }
+      }
+    })
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -241,7 +246,10 @@
             </div>
           </template>
           <template #description>
-            <span>{{ item.person }}</span>
+            <!-- <span>{{ item.person }}</span> -->
+            <div v-if="item.person">{{ item.person }}</div>
+            <div v-if="!item.person" style="opacity: 0;">111</div>
+            <div style="white-space: nowrap">{{ item.time }}</div>
           </template>
         </el-step>
       </el-steps>
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 9740f68..e701d2e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -23,6 +23,7 @@
   upEndTime: '',
 })
 const deviceTypeList = ref<any[]>([])
+const isFirst = ref(true)
 // 时间查询条件
 const timerangForCollect = ref<string[]>([])
 const timerangForReport = ref<string[]>([])
@@ -261,6 +262,12 @@
       }
     }))
   }
+  if (listQuery.value.typeName.includes('云台') && isFirst.value) {
+    timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+    listQuery.value.logBegTime = dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss')
+    listQuery.value.logEndTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  isFirst.value = false
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
     // if (listQuery.value.typeName === '智能警示桩') {
@@ -401,6 +408,8 @@
   getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     deviceTypeList.value = res.data.rows
     setColumn()
+
+
     fetchData()
   })
 })
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index e71e7fb..6111413 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -129,7 +129,7 @@
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
     detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
     // console.log(detailInfo.value, 'detailInfo.value')
-    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD') : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -146,12 +146,21 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
-    // approvalPerson
     alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
       ...item,
       approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
     }))
-    // console.log(alarmDynamics.value, 'alarmDynamics.value')
+    alarmDynamics.value.forEach((item: any) => {
+      if (item.descn) {
+        if (item.process_name === '挂起') {
+          item.descn = `挂起时长：${item.descn.split('|')[0] || ''}${item.descn.split('|')[0] ? '小时' : ''} ；
+            挂起原因：${item.descn.split('|')[1] || ''}；`
+        }
+        else {
+          item.descn = `内容：${item.descn}`
+        }
+      }
+    })
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -161,7 +170,31 @@
 const mapRef = ref()
 const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
-  // console.log(data, 'data')
+  if (data.text === '设备编号') {
+    if (!detailInfo.value.devcode || !detailInfo.value.devTypeName) {
+      ElMessage.warning('缺少设备关键信息')
+      return
+    }
+    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+      ElMessage.warning('没有对应权限菜单')
+      return
+    }
+    $router.push({
+      name: 'DeviceManageDetail',
+      params: {
+        type: 'detail',
+      },
+      query: {
+        row: JSON.stringify({
+          devcode: detailInfo.value.devcode,
+          deviceType: detailInfo.value.devTypeName,
+          deviceTypeName: detailInfo.value.devTypeName,
+          devTypeName: detailInfo.value.devTypeName,
+        }),
+      },
+    })
+    return
+  }
   if (data.text === '位置') {
     if (detailInfo.value.watchObject && detailInfo.value.devcode && detailInfo.value.ledgerId) {
       const watchObject = {
@@ -227,10 +260,13 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
-            @click="showMap(item)"
-          >
-            {{ detailInfo[item.value] || '' }}
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            @click="showMap(item)">
+            <el-tooltip v-if="item.text === '设备编号'" class="box-item" effect="dark"
+              :content="`${detailInfo?.devTypeName}(${detailInfo?.manufactureName})`" placement="top">
+              {{ detailInfo[item.value] || '' }}
+            </el-tooltip>
+            <span v-else>{{ detailInfo[item.value] || '' }}</span>
           </span>
         </el-descriptions-item>
         <el-descriptions-item v-loading="loadingDynamics" align="left" label-align="center">
@@ -241,12 +277,11 @@
           </template>
           <div style="padding: 25px;">
             <el-timeline>
-              <el-timeline-item
-                v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
-                type="primary"
-              >
-                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')'
-                  : ''}${item.process_name}` }}
+              <el-timeline-item v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
+                type="primary">
+                <div>{{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
+                  ''}${item.process_name}` }}</div>
+                <div v-if="item.descn">{{ item.descn }}</div>
               </el-timeline-item>
             </el-timeline>
           </div>

diff --git a/src/api/index.ts b/src/api/index.ts
index c44d085..fb47f1a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout')) {
+      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/components/VirtualTable/index.vue b/src/components/VirtualTable/index.vue
index a7a15cf..76f7d10 100644
--- a/src/components/VirtualTable/index.vue
+++ b/src/components/VirtualTable/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格
+  Description: 虚拟滚动列表 -- 适用于不分页 数据量大的 table表格 文档地址：https://vxeui.com/#/start/install
   Author: 李亚光
   Date: 2025-04-15
  -->
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index dfe3a07..199a47a 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -165,7 +165,7 @@
 // 去挂起
 const pendingRef = ref()
 const pending = () => {
-  if (!dataForm.value.confirmValue) {
+  if (!dataForm.value.confirmValue && info.value.alarmCategory?.includes('浓度')) {
     ElMessage.warning('现场浓度值不能为空')
     return
   }
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 9edd699..4572d68 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -83,11 +83,11 @@
     value: 'personName',
     align: 'center',
   },
-  {
-    text: '是否误报',
-    value: 'realAlarmName',
-    align: 'center',
-  },
+  // {
+  //   text: '是否误报',
+  //   value: 'realAlarmName',
+  //   align: 'center',
+  // },
   {
     text: '解除时间',
     value: 'cancelTime',
@@ -98,13 +98,13 @@
     value: 'duration',
     align: 'center',
   },
-  {
-    text: '',
-    value: '',
-    align: '',
-  },
+  // {
+  //   text: '',
+  //   value: '',
+  //   align: '',
+  // },
 ])
-if($route.query.type === 'history') {
+if ($route.query.type === 'history') {
   descriptionsList.value = descriptionsList.value.filter((item) => item.text !== '是否误报' && item.text)
 }
 // 报警动态
@@ -139,6 +139,13 @@
     else {
       detailInfo.value.alarmReason = (alarmValue[detailInfo.value.alarmValue] || '其他')
     }
+    if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度')) {
+      descriptionsList.value = descriptionsList.value.filter(item => item.text !== '详细地址')
+      descriptionsList.value.push({
+        text: '',
+        value: ''
+      })
+    }
     // 查询设备类型和厂商
     getDeviceListPage({ offset: 1, limit: 1, devCode: detailInfo.value.devcode }).then(res => {
       if (res.data.rows.length) {
@@ -168,6 +175,17 @@
       ...item,
       approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
     }))
+    alarmDynamics.value.forEach((item: any) => {
+      if (item.descn) {
+        if (item.process_name === '挂起') {
+          item.descn = `挂起时长：${item.descn.split('|')[0] || ''}${item.descn.split('|')[0] ? '小时' : ''} ；
+            挂起原因：${item.descn.split('|')[1] || ''}；`
+        }
+        else {
+          item.descn = `内容：${item.descn}`
+        }
+      }
+    })
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -176,7 +194,10 @@
 // 点击经纬度展示地图
 const mapRef = ref()
 const { proxy } = getCurrentInstance() as any
-const showMap = (data: any) => {
+const showMap = (data: any, skip: boolean) => {
+  if (!detailInfo.value.alarmCategory.includes('浓度') && !detailInfo.value.alarmTypeName.includes('浓度') && data.text === '位置' && !skip) {
+    return
+  }
   // console.log(data, 'data')
   if (data.text === '设备编号') {
     // JSON.parse($route.query.row as string).devcode
@@ -288,15 +309,27 @@
           </template>
           <span
             :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
-            @click="showMap(item)">
+            @click="showMap(item, false)">
             <el-tooltip v-if="showDeviceTips && item.text === '设备编号'" class="box-item" effect="dark"
               :content="`${deviceTips.typeName}(${deviceTips.manufactureName})`" placement="top">
               {{ detailInfo[item.value] || '' }}
             </el-tooltip>
-            <template v-else>{{ detailInfo[item.value] || '' }}
-              <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
-              <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
-                size="small" @click="viewData">查看数据</el-button>
+            <template v-else>
+              <template
+                v-if="item.text === '位置' && !detailInfo.alarmCategory?.includes('浓度') && !detailInfo.alarmTypeName?.includes('浓度')">
+                <el-popconfirm confirm-button-text="地图点位" cancel-button-text="安装位置" icon-color="#626AEF"
+                  title="选择查看内容?" @confirm="showMap({...item, text: '详细地址'}, true)" @cancel="showMap({...item, text: '位置'}, true)" width="180">
+                  <template #reference>
+                    {{ detailInfo[item.value] || '' }}
+                  </template>
+                </el-popconfirm>
+              </template>
+              <template v-else>
+                {{ detailInfo[item.value] || '' }}
+                <!-- 报警原因 --查看数据(浓度类报警)按钮 -->
+                <el-button v-if="item.text === '报警原因' && detailInfo.alarmCategory?.includes('浓度')" type="primary"
+                  size="small" @click="viewData">查看数据</el-button>
+              </template>
             </template>
           </span>
         </el-descriptions-item>
@@ -310,8 +343,9 @@
             <el-timeline>
               <el-timeline-item v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
                 type="primary">
-                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
-                  ''}${item.process_name}` }}
+                <div>{{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
+                  ''}${item.process_name}` }}</div>
+                <div v-if="item.descn">{{ item.descn }}</div>
               </el-timeline-item>
             </el-timeline>
           </div>
@@ -352,4 +386,10 @@
     --el-descriptions-table-border-top: none;
   }
 }
+
+::v-deep(.el-popconfirm__action) {
+  .el-popconfirm__action{
+    background-color: #0d76d4;
+  }
+}
 </style>
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index 87324cb..ae1a319 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -334,14 +334,14 @@
           {{ info?.address }}
         </span>
       </div> -->
-      <div v-if="type === 'data'" class="item">
+      <div v-if="type === 'data' || type === 'device'" class="item">
         位置:
         <span style="padding-left: 6px;" class="more" @click="goDetailWell">
           {{ info?.address }}
           <!-- {{ `${info.ledgerNumber} ${info.ledgerNumber ? '|' : ''}${info.ledgerName}` }} -->
         </span>
       </div>
-      <div v-if="type === 'device' || (type === 'data' && info.alarmCategory?.includes('浓度'))" class="item">
+      <div v-if="(type === 'data' && info.alarmCategory?.includes('浓度'))|| type === 'device' " class="item">
         详细地址:
         <span style="padding-left: 6px;">
           {{ info.position }}
diff --git a/src/views/home/alarm/current/components/processDialog.vue b/src/views/home/alarm/current/components/processDialog.vue
index e8afa0c..b21f678 100644
--- a/src/views/home/alarm/current/components/processDialog.vue
+++ b/src/views/home/alarm/current/components/processDialog.vue
@@ -29,16 +29,16 @@
   },
   {
     name: '确认人员',
-    procrssNames: ['已确认'],
-    processCode: ['5'],
+    procrssNames: ['已确认', '待处置'],
+    processCode: ['5', '6'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 3,
   },
   {
     name: '处置人员',
-    procrssNames: ['待处置', '已处置'],
-    processCode: ['6', '7'],
+    procrssNames: ['已处置'],
+    processCode: ['7'],
     icon0: '人员-0',
     icon1: '人员-1',
     active: 4,
@@ -46,7 +46,7 @@
   {
     name: '设备正常',
     procrssNames: ['已处置'],
-    processCode: ['7','10', '8'],
+    processCode: ['7', '10', '8'],
     icon0: '设备-0',
     icon1: '设备-1',
     active: 5,
@@ -54,7 +54,7 @@
   {
     name: '结束',
     procrssNames: ['已处置'],
-    processCode: ['7','10'],
+    processCode: ['7', '10'],
     icon0: '结束',
     icon1: '结束',
     active: 6,
@@ -91,18 +91,16 @@
 // 初始化对话框
 const loading = ref(true)
 const initDialog = (row: any) => {
-  // console.log(row, 'row')
   dialogFormVisible.value = true
   loading.value = true
   processData.value = JSON.parse(JSON.stringify(initData))
   alarmProcessNode(row.id).then((res) => {
     if (res.data.length) {
-      res.data =res.data.map((item:any) => ({
+      res.data = res.data.map((item: any) => ({
         ...item,
         APPROVAL_PERSON: isEncrypt(item.APPROVAL_PERSON) ? decrypt(item.APPROVAL_PERSON) : item.APPROVAL_PERSON,
         NAME: isEncrypt(item.NAME) ? decrypt(item.NAME) : item.NAME,
       }))
-      // console.log(res.data, '报警流程')
       const last = res.data[res.data.length - 1]
       // 挂起流程
       if (last.FLOW_STATUS === '3') {
@@ -116,45 +114,41 @@
         })
         active.value = 3
         processData.value = processData.value.map((item, index) => ({ ...item, active: index + 1 }))
-        // console.log(processData.value, 'processData.value')
-        // 处理content
         // 已读
         const already = res.data.filter((item: any) => item.process_name === '已读' || item.process_name === '未读')
         processData.value[0].content = `
-        <span>时间: ${already[0].APPROVAL_TIME}</span></br>
         <span>人员: ${already[0].NAME || already[0].APPROVAL_PERSON}</span></br>
+        <span>时间: ${already[0].APPROVAL_TIME}</span></br>
         <span>操作: ${already[0].process_name}</span></br>
         `
         // 分中心确认
         const confirm = res.data.filter((item: any) => item.process_name === '待现场确认')
         processData.value[1].content = `
-        <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
         <span>人员: ${confirm[0].NAME || confirm[0].APPROVAL_PERSON}}</span></br>
+        <span>时间: ${confirm[0].APPROVAL_TIME}</span></br>
         <span>操作: 已读</span></br>
         `
         // 挂起
         const pending = res.data.filter((item: any) => item.process_name === '挂起')
         processData.value[2].content = `
-        <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>人员: ${pending[0].NAME || pending[0].APPROVAL_PERSON}</span></br>
+        <span>时间: ${pending[0].APPROVAL_TIME}</span></br>
         <span>操作: ${pending[0].process_name}</span></br>
         <span>挂起时长: ${pending[0].DESCN?.split('|')[0] || ''}小时</span></br>
         <span>挂起原因: ${pending[0].DESCN?.split('|')[1] || ''}</span></br>
         <span>剩余时长: ${computedDuartion(pending[0].APPROVAL_TIME, pending[0].DESCN?.split('|')[0])}</span></br>
         `
-        // console.log(processData.value, ' processData.value[1]')
       }
       else {
         const data = uniqueMultiArray(res.data, 'process_name')
+        console.log(data, 'data')
         data.forEach((item: any, index: number) => {
           const cindex = processData.value.findIndex((citem: any) => citem.processCode?.includes(item.FLOW_STATUS))
           if (cindex !== -1) {
-            // console.log(1111)
-            // console.log(processData.value[cindex].procrssNames)
             if (processData.value[cindex].procrssNames.includes('已确认') || processData.value[cindex].procrssNames.includes('已处置')) {
               processData.value[cindex].content = `
-        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
+        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         <span>${processData.value[cindex].procrssNames.includes('已确认') ? '确认' : processData.value[cindex].procrssNames.includes('已处置') ? '处置' : ''}内容:
 
@@ -165,8 +159,8 @@
             }
             else {
               processData.value[cindex].content = `
-        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>人员: ${data[index].NAME || data[index].APPROVAL_PERSON}</span></br>
+        <span>时间: ${data[index].APPROVAL_TIME}</span></br>
         <span>操作: ${data[index].process_name}</span></br>
         `
             }
@@ -203,6 +197,17 @@
       }
       // console.log(processData.value, 'processDataprocessData')
     }
+    // console.log(processData, 'processData')
+    processData.value.forEach((item, index) => {
+      if (item.content) {
+        const str = item.content
+        const regex = /(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/;
+        const match = str.match(regex);
+        if (match) {
+          item.time = match[1]
+        }
+      }
+    })
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -241,7 +246,10 @@
             </div>
           </template>
           <template #description>
-            <span>{{ item.person }}</span>
+            <!-- <span>{{ item.person }}</span> -->
+            <div v-if="item.person">{{ item.person }}</div>
+            <div v-if="!item.person" style="opacity: 0;">111</div>
+            <div style="white-space: nowrap">{{ item.time }}</div>
           </template>
         </el-step>
       </el-steps>
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index 9740f68..e701d2e 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -23,6 +23,7 @@
   upEndTime: '',
 })
 const deviceTypeList = ref<any[]>([])
+const isFirst = ref(true)
 // 时间查询条件
 const timerangForCollect = ref<string[]>([])
 const timerangForReport = ref<string[]>([])
@@ -261,6 +262,12 @@
       }
     }))
   }
+  if (listQuery.value.typeName.includes('云台') && isFirst.value) {
+    timerangForReport.value = [dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')]
+    listQuery.value.logBegTime = dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss')
+    listQuery.value.logEndTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  isFirst.value = false
   getDataSearch(listQuery.value).then((res) => {
     list.value = res.data.map((item: any) => toHumpObject(item))
     // if (listQuery.value.typeName === '智能警示桩') {
@@ -401,6 +408,8 @@
   getDeviceTypeListPage({ offset: 1, limit: 99999 }).then((res) => {
     deviceTypeList.value = res.data.rows
     setColumn()
+
+
     fetchData()
   })
 })
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index e71e7fb..6111413 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -129,7 +129,7 @@
     detailInfo.value.duration = detailInfo.value.ts && detailInfo.value.cancelTime ? getDateDiff(detailInfo.value.ts, detailInfo.value.cancelTime) : ''
     detailInfo.value.address = `${detailInfo.value.tagNumber} ${detailInfo.value.tagNumber ? '|' : ''}${res.data.ledgerName}`
     // console.log(detailInfo.value, 'detailInfo.value')
-    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD')  : ''
+    detailInfo.value.installDate = detailInfo.value.installDate ? dayjs(detailInfo.value.installDate).format('YYYY-MM-DD') : ''
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -146,12 +146,21 @@
       approvalPerson: '报警生成',
       dept_name: '',
     })
-    // approvalPerson
     alarmDynamics.value = alarmDynamics.value.map((item: any) => ({
       ...item,
       approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
     }))
-    // console.log(alarmDynamics.value, 'alarmDynamics.value')
+    alarmDynamics.value.forEach((item: any) => {
+      if (item.descn) {
+        if (item.process_name === '挂起') {
+          item.descn = `挂起时长：${item.descn.split('|')[0] || ''}${item.descn.split('|')[0] ? '小时' : ''} ；
+            挂起原因：${item.descn.split('|')[1] || ''}；`
+        }
+        else {
+          item.descn = `内容：${item.descn}`
+        }
+      }
+    })
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -161,7 +170,31 @@
 const mapRef = ref()
 const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
-  // console.log(data, 'data')
+  if (data.text === '设备编号') {
+    if (!detailInfo.value.devcode || !detailInfo.value.devTypeName) {
+      ElMessage.warning('缺少设备关键信息')
+      return
+    }
+    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+      ElMessage.warning('没有对应权限菜单')
+      return
+    }
+    $router.push({
+      name: 'DeviceManageDetail',
+      params: {
+        type: 'detail',
+      },
+      query: {
+        row: JSON.stringify({
+          devcode: detailInfo.value.devcode,
+          deviceType: detailInfo.value.devTypeName,
+          deviceTypeName: detailInfo.value.devTypeName,
+          devTypeName: detailInfo.value.devTypeName,
+        }),
+      },
+    })
+    return
+  }
   if (data.text === '位置') {
     if (detailInfo.value.watchObject && detailInfo.value.devcode && detailInfo.value.ledgerId) {
       const watchObject = {
@@ -227,10 +260,13 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
-            @click="showMap(item)"
-          >
-            {{ detailInfo[item.value] || '' }}
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            @click="showMap(item)">
+            <el-tooltip v-if="item.text === '设备编号'" class="box-item" effect="dark"
+              :content="`${detailInfo?.devTypeName}(${detailInfo?.manufactureName})`" placement="top">
+              {{ detailInfo[item.value] || '' }}
+            </el-tooltip>
+            <span v-else>{{ detailInfo[item.value] || '' }}</span>
           </span>
         </el-descriptions-item>
         <el-descriptions-item v-loading="loadingDynamics" align="left" label-align="center">
@@ -241,12 +277,11 @@
           </template>
           <div style="padding: 25px;">
             <el-timeline>
-              <el-timeline-item
-                v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
-                type="primary"
-              >
-                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')'
-                  : ''}${item.process_name}` }}
+              <el-timeline-item v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
+                type="primary">
+                <div>{{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
+                  ''}${item.process_name}` }}</div>
+                <div v-if="item.descn">{{ item.descn }}</div>
               </el-timeline-item>
             </el-timeline>
           </div>
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 0703c85..9bd8873 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -150,6 +150,17 @@
       ...item,
       approvalPerson: isEncrypt(item.approvalPerson) ? decrypt(item.approvalPerson) : item.approvalPerson,
     }))
+    alarmDynamics.value.forEach((item: any) => {
+      if (item.descn) {
+        if (item.process_name === '挂起') {
+          item.descn = `挂起时长：${item.descn.split('|')[0] || ''}${item.descn.split('|')[0] ? '小时' : ''} ；
+            挂起原因：${item.descn.split('|')[1] || ''}；`
+        }
+        else {
+          item.descn = `内容：${item.descn}`
+        }
+      }
+    })
     loadingDynamics.value = false
   }).catch(() => {
     loadingDynamics.value = false
@@ -157,32 +168,64 @@
 }
 // 点击经纬度展示地图
 const mapRef = ref()
+const { proxy } = getCurrentInstance() as any
 const showMap = (data: any) => {
-  // console.log(data, 'data')
-  // if (data.text === '位置') {
-  //   if (detailInfo.value.watchObject && detailInfo.value.devcode && detailInfo.value.ledgerId) {
-  //     const watchObject = {
-  //       1: 'WellMonitorDetail',
-  //       2: 'StationMonitorDetail',
-  //       3: 'PipelineMonitorDetail',
-  //     } as { [key: string]: string }
-  //     $router.push({
-  //       name: watchObject[detailInfo.value.watchObject],
-  //       query: {
-  //         id: detailInfo.value.ledgerId,
-  //         deviceCode: detailInfo.value.devcode,
-  //         typeName: detailInfo.value.devTypeName,
-  //         row: JSON.stringify({
-  //           id: detailInfo.value.ledgerId,
-  //           typeName: detailInfo.value.devTypeName,
-  //           deviceCode: detailInfo.value.devcode,
-  //         }),
-  //       },
-  //     })
-  //     // $router
-  //   }
-  //   return
-  // }
+  if (data.text === '设备编号') {
+    if (!detailInfo.value.devCode || !detailInfo.value.devTypeName) {
+      ElMessage.warning('缺少设备关键信息')
+      return
+    }
+    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+      ElMessage.warning('没有对应权限菜单')
+      return
+    }
+    $router.push({
+      name: 'DeviceManageDetail',
+      params: {
+        type: 'detail',
+      },
+      query: {
+        row: JSON.stringify({
+          devcode: detailInfo.value.devCode,
+          deviceType: detailInfo.value.devTypeName,
+          deviceTypeName: detailInfo.value.devTypeName,
+          devTypeName: detailInfo.value.devTypeName,
+        }),
+      },
+    })
+    return
+  }
+  if (data.text === '位置') {
+    if (detailInfo.value.watchObject && detailInfo.value.devCode && detailInfo.value.ledgerId) {
+      const watchObject = {
+        1: 'WellMonitorDetail',
+        2: 'StationMonitorDetail',
+        3: 'PipelineMonitorDetail',
+      } as { [key: string]: string }
+      // 判断是否有菜单权限
+      const watchObjectAuth = {
+        1: '/well',
+        2: '/station/monitor',
+        3: '/pipeline',
+      } as { [key: string]: string }
+      if (!proxy.hasPerm(watchObjectAuth[detailInfo.value.watchObject])) { return }
+      $router.push({
+        name: watchObject[detailInfo.value.watchObject],
+        query: {
+          id: detailInfo.value.ledgerId,
+          deviceCode: detailInfo.value.devCode,
+          typeName: detailInfo.value.devTypeName,
+          row: JSON.stringify({
+            id: detailInfo.value.ledgerId,
+            typeName: detailInfo.value.devTypeName,
+            deviceCode: detailInfo.value.devCode,
+          }),
+        },
+      })
+      // $router
+    }
+    return
+  }
   if (data.text !== '详细地址' || !detailInfo.value[data.value]) {
     return
   }
@@ -217,10 +260,13 @@
             </span>
           </template>
           <span
-            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' ? 'pointer link' : ''}`"
-            @click="showMap(item)"
-          >
-            {{ detailInfo[item.value] || '' }}
+            :class="`${item.text === '详细地址' ? 'pointer link' : item.text === '位置' || item.text === '设备编号' ? 'pointer link' : ''}`"
+            @click="showMap(item)">
+            <el-tooltip v-if="item.text === '设备编号'" class="box-item" effect="dark"
+              :content="`${detailInfo?.devTypeName}(${detailInfo?.manufactureName})`" placement="top">
+              {{ detailInfo[item.value] || '' }}
+            </el-tooltip>
+            <span v-else>{{ detailInfo[item.value] || '' }}</span>
           </span>
         </el-descriptions-item>
         <el-descriptions-item v-loading="loadingDynamics" align="left" label-align="center">
@@ -231,12 +277,11 @@
           </template>
           <div style="padding: 25px;">
             <el-timeline>
-              <el-timeline-item
-                v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
-                type="primary"
-              >
-                {{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')'
-                  : ''}${item.process_name}` }}
+              <el-timeline-item v-for="(item, index) in alarmDynamics" :key="index" :timestamp="item.approvalTime"
+                type="primary">
+                <div>{{ `${item.approvalPerson}${item.dept_name ? '(' : ''}${item.dept_name}${item.dept_name ? ')' :
+                  ''}${item.process_name}` }}</div>
+                <div v-if="item.descn">{{ item.descn }}</div>
               </el-timeline-item>
             </el-timeline>
           </div>
@@ -261,13 +306,13 @@
   }
 }
 
-// .link {
-//   color: #3d7eff;
+.link {
+  color: #0d76d4;
 
-//   &:hover {
-//     text-decoration: underline;
-//   }
-// }
+  &:hover {
+    text-decoration: underline;
+  }
+}
 
 .bottom {
   --el-descriptions-table-border-top: none;