diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f9c6697..94f6fa9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,7 +4,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f9c6697..94f6fa9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,7 +4,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a41440b..f92cecb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,7 +9,7 @@
           clearable
         />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
           size="small"
@@ -113,6 +113,18 @@
 export default {
   name: 'ListAlarmRecords',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -221,19 +233,10 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
-    console.log('records created')
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
+    if (isOperation() === false) {
+      this.listQuery.alarmType = '1'
     }
-    next()
+    console.log('records created')
   },
   mounted() {
     if (this.$route.query && this.$route.query.wellCode) {

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f9c6697..94f6fa9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,7 +4,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a41440b..f92cecb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,7 +9,7 @@
           clearable
         />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
           size="small"
@@ -113,6 +113,18 @@
 export default {
   name: 'ListAlarmRecords',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -221,19 +233,10 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
-    console.log('records created')
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
+    if (isOperation() === false) {
+      this.listQuery.alarmType = '1'
     }
-    next()
+    console.log('records created')
   },
   mounted() {
     if (this.$route.query && this.$route.query.wellCode) {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 5462b41..e85c342 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -39,7 +39,7 @@
           permission: '/device/list'
         },
         {
-          title: '当前报警数',
+          title: '当前告警数',
           flags: '',
           context: '--',
           icon: 'icon-alarm',

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f9c6697..94f6fa9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,7 +4,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a41440b..f92cecb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,7 +9,7 @@
           clearable
         />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
           size="small"
@@ -113,6 +113,18 @@
 export default {
   name: 'ListAlarmRecords',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -221,19 +233,10 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
-    console.log('records created')
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
+    if (isOperation() === false) {
+      this.listQuery.alarmType = '1'
     }
-    next()
+    console.log('records created')
   },
   mounted() {
     if (this.$route.query && this.$route.query.wellCode) {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 5462b41..e85c342 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -39,7 +39,7 @@
           permission: '/device/list'
         },
         {
-          title: '当前报警数',
+          title: '当前告警数',
           flags: '',
           context: '--',
           icon: 'icon-alarm',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 026467f..c7b7f3a 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -12,7 +12,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -131,6 +131,18 @@
       }
     }
   },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -264,18 +276,6 @@
     this.fetchJobStatus() // 工单状态
     this.fetchData()
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f9c6697..94f6fa9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,7 +4,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a41440b..f92cecb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,7 +9,7 @@
           clearable
         />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
           size="small"
@@ -113,6 +113,18 @@
 export default {
   name: 'ListAlarmRecords',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -221,19 +233,10 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
-    console.log('records created')
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
+    if (isOperation() === false) {
+      this.listQuery.alarmType = '1'
     }
-    next()
+    console.log('records created')
   },
   mounted() {
     if (this.$route.query && this.$route.query.wellCode) {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 5462b41..e85c342 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -39,7 +39,7 @@
           permission: '/device/list'
         },
         {
-          title: '当前报警数',
+          title: '当前告警数',
           flags: '',
           context: '--',
           icon: 'icon-alarm',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 026467f..c7b7f3a 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -12,7 +12,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -131,6 +131,18 @@
       }
     }
   },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -264,18 +276,6 @@
     this.fetchJobStatus() // 工单状态
     this.fetchData()
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index b41c2cd..deb38ee 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -5,7 +5,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -99,6 +99,18 @@
 export default {
   name: 'ListJobsOverTimeGet',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -175,13 +187,8 @@
       detailShow: false // 是否显示编辑框
     }
   },
-  computed: {
-    alarmType() {
-      return this.listQuery.alarmType
-    }
-  },
   watch: {
-    alarmType(val) {
+    'listQuery.alarmType'(val) {
       this.listQuery.alarmContentType = ''
       if (val && val !== '') {
         this.fetchAlarmContentType()
@@ -208,18 +215,6 @@
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchData()
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   activated() {
     // 如果不是从详情页来
     if (!isFromDetail) {
@@ -322,7 +317,8 @@
       getAlarmContentType(this.listQuery.alarmType).then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+          const deviceType = '' + item.deviceType
+          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f9c6697..94f6fa9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,7 +4,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a41440b..f92cecb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,7 +9,7 @@
           clearable
         />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
           size="small"
@@ -113,6 +113,18 @@
 export default {
   name: 'ListAlarmRecords',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -221,19 +233,10 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
-    console.log('records created')
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
+    if (isOperation() === false) {
+      this.listQuery.alarmType = '1'
     }
-    next()
+    console.log('records created')
   },
   mounted() {
     if (this.$route.query && this.$route.query.wellCode) {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 5462b41..e85c342 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -39,7 +39,7 @@
           permission: '/device/list'
         },
         {
-          title: '当前报警数',
+          title: '当前告警数',
           flags: '',
           context: '--',
           icon: 'icon-alarm',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 026467f..c7b7f3a 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -12,7 +12,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -131,6 +131,18 @@
       }
     }
   },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -264,18 +276,6 @@
     this.fetchJobStatus() // 工单状态
     this.fetchData()
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index b41c2cd..deb38ee 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -5,7 +5,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -99,6 +99,18 @@
 export default {
   name: 'ListJobsOverTimeGet',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -175,13 +187,8 @@
       detailShow: false // 是否显示编辑框
     }
   },
-  computed: {
-    alarmType() {
-      return this.listQuery.alarmType
-    }
-  },
   watch: {
-    alarmType(val) {
+    'listQuery.alarmType'(val) {
       this.listQuery.alarmContentType = ''
       if (val && val !== '') {
         this.fetchAlarmContentType()
@@ -208,18 +215,6 @@
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchData()
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   activated() {
     // 如果不是从详情页来
     if (!isFromDetail) {
@@ -322,7 +317,8 @@
       getAlarmContentType(this.listQuery.alarmType).then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+          const deviceType = '' + item.deviceType
+          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index f5da4bb..6ef09b0 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -5,7 +5,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -98,6 +98,18 @@
 export default {
   name: 'ListJobsOverTimeHandle',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -222,18 +234,6 @@
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   mounted() {
     this.fetchData()
   },
@@ -337,7 +337,8 @@
       getAlarmContentType(this.listQuery.alarmType).then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+          const deviceType = '' + item.deviceType
+          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f9c6697..94f6fa9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,7 +4,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a41440b..f92cecb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,7 +9,7 @@
           clearable
         />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
           size="small"
@@ -113,6 +113,18 @@
 export default {
   name: 'ListAlarmRecords',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -221,19 +233,10 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
-    console.log('records created')
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
+    if (isOperation() === false) {
+      this.listQuery.alarmType = '1'
     }
-    next()
+    console.log('records created')
   },
   mounted() {
     if (this.$route.query && this.$route.query.wellCode) {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 5462b41..e85c342 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -39,7 +39,7 @@
           permission: '/device/list'
         },
         {
-          title: '当前报警数',
+          title: '当前告警数',
           flags: '',
           context: '--',
           icon: 'icon-alarm',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 026467f..c7b7f3a 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -12,7 +12,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -131,6 +131,18 @@
       }
     }
   },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -264,18 +276,6 @@
     this.fetchJobStatus() // 工单状态
     this.fetchData()
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index b41c2cd..deb38ee 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -5,7 +5,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -99,6 +99,18 @@
 export default {
   name: 'ListJobsOverTimeGet',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -175,13 +187,8 @@
       detailShow: false // 是否显示编辑框
     }
   },
-  computed: {
-    alarmType() {
-      return this.listQuery.alarmType
-    }
-  },
   watch: {
-    alarmType(val) {
+    'listQuery.alarmType'(val) {
       this.listQuery.alarmContentType = ''
       if (val && val !== '') {
         this.fetchAlarmContentType()
@@ -208,18 +215,6 @@
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchData()
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   activated() {
     // 如果不是从详情页来
     if (!isFromDetail) {
@@ -322,7 +317,8 @@
       getAlarmContentType(this.listQuery.alarmType).then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+          const deviceType = '' + item.deviceType
+          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index f5da4bb..6ef09b0 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -5,7 +5,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -98,6 +98,18 @@
 export default {
   name: 'ListJobsOverTimeHandle',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -222,18 +234,6 @@
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   mounted() {
     this.fetchData()
   },
@@ -337,7 +337,8 @@
       getAlarmContentType(this.listQuery.alarmType).then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+          const deviceType = '' + item.deviceType
+          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 06231ae..7852e18 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -4,7 +4,7 @@
  * @Date: 2022-05-13
  -->
 <template>
-  <div v-if="this.show && data.length>0">
+  <div v-if="show && data.length>0">
     <transition enter-active-class="animate__animated animate__fadeIn" leave-active-class="animate__animated animate__fadeOut" :duration="500" mode="out-in">
       <div v-if="!tableShow" class="alarm-hidden-div" @click="tableShow=!tableShow">
         告警列表<span>({{ data.length }})</span>
@@ -79,7 +79,7 @@
 <style lang="scss" scoped>
 .alarm-hidden-div{
   position: absolute;
-  z-index: 100;
+  z-index: 5000;
   top: 0px;
   left: 0px;
   box-sizing: border-box;
@@ -102,7 +102,7 @@
 }
 .map-alarm-div{
   position: absolute;
-  z-index: 100;
+  z-index: 5000;
   top: 0px;
   left: 0px;
   display: flex;

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f9c6697..94f6fa9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -4,7 +4,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a41440b..f92cecb 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -9,7 +9,7 @@
           clearable
         />
       </search-item>
-      <search-item v-if="operation">
+      <search-item v-if="showAlarmType">
         <el-select
           v-model="listQuery.alarmType"
           size="small"
@@ -113,6 +113,18 @@
 export default {
   name: 'ListAlarmRecords',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -221,19 +233,10 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
-    console.log('records created')
-  },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
+    if (isOperation() === false) {
+      this.listQuery.alarmType = '1'
     }
-    next()
+    console.log('records created')
   },
   mounted() {
     if (this.$route.query && this.$route.query.wellCode) {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 5462b41..e85c342 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -39,7 +39,7 @@
           permission: '/device/list'
         },
         {
-          title: '当前报警数',
+          title: '当前告警数',
           flags: '',
           context: '--',
           icon: 'icon-alarm',
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 026467f..c7b7f3a 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -12,7 +12,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -131,6 +131,18 @@
       }
     }
   },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -264,18 +276,6 @@
     this.fetchJobStatus() // 工单状态
     this.fetchData()
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   activated() {
     if (!isFromDetail) {
       this.listQuery.keywords = ''
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index b41c2cd..deb38ee 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -5,7 +5,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -99,6 +99,18 @@
 export default {
   name: 'ListJobsOverTimeGet',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -175,13 +187,8 @@
       detailShow: false // 是否显示编辑框
     }
   },
-  computed: {
-    alarmType() {
-      return this.listQuery.alarmType
-    }
-  },
   watch: {
-    alarmType(val) {
+    'listQuery.alarmType'(val) {
       this.listQuery.alarmContentType = ''
       if (val && val !== '') {
         this.fetchAlarmContentType()
@@ -208,18 +215,6 @@
     this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchData()
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   activated() {
     // 如果不是从详情页来
     if (!isFromDetail) {
@@ -322,7 +317,8 @@
       getAlarmContentType(this.listQuery.alarmType).then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+          const deviceType = '' + item.deviceType
+          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index f5da4bb..6ef09b0 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -5,7 +5,7 @@
       <search-item>
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号" clearable />
       </search-item>
-      <search-item>
+      <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
@@ -98,6 +98,18 @@
 export default {
   name: 'ListJobsOverTimeHandle',
   components: { infoWell },
+  beforeRouteEnter(to, from, next) {
+    if (from.name) {
+      if (from.name.indexOf('DetailJob') === -1) {
+        isFromDetail = false
+      } else {
+        isFromDetail = true
+      }
+    } else {
+      isFromDetail = false
+    }
+    next()
+  },
   data() {
     return {
       listQuery: {
@@ -222,18 +234,6 @@
     this.fetchAlarmType() // 告警类型下拉菜单
     this.fetchAlarmContentType() // 告警内容下拉菜单
   },
-  beforeRouteEnter(to, from, next) {
-    if (from.name) {
-      if (from.name.indexOf('DetailJob') === -1) {
-        isFromDetail = false
-      } else {
-        isFromDetail = true
-      }
-    } else {
-      isFromDetail = false
-    }
-    next()
-  },
   mounted() {
     this.fetchData()
   },
@@ -337,7 +337,8 @@
       getAlarmContentType(this.listQuery.alarmType).then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+          const deviceType = '' + item.deviceType
+          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/overview/components/alarmList.vue b/src/views/overview/components/alarmList.vue
index 06231ae..7852e18 100644
--- a/src/views/overview/components/alarmList.vue
+++ b/src/views/overview/components/alarmList.vue
@@ -4,7 +4,7 @@
  * @Date: 2022-05-13
  -->
 <template>
-  <div v-if="this.show && data.length>0">
+  <div v-if="show && data.length>0">
     <transition enter-active-class="animate__animated animate__fadeIn" leave-active-class="animate__animated animate__fadeOut" :duration="500" mode="out-in">
       <div v-if="!tableShow" class="alarm-hidden-div" @click="tableShow=!tableShow">
         告警列表<span>({{ data.length }})</span>
@@ -79,7 +79,7 @@
 <style lang="scss" scoped>
 .alarm-hidden-div{
   position: absolute;
-  z-index: 100;
+  z-index: 5000;
   top: 0px;
   left: 0px;
   box-sizing: border-box;
@@ -102,7 +102,7 @@
 }
 .map-alarm-div{
   position: absolute;
-  z-index: 100;
+  z-index: 5000;
   top: 0px;
   left: 0px;
   display: flex;
diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue
index 7565502..1baa2e2 100644
--- a/src/views/overview/overviewAmap.vue
+++ b/src/views/overview/overviewAmap.vue
@@ -381,7 +381,8 @@
       // 1.过滤井图层
       if (this.type === 'massMarkers') {
         const wellTypes = checkedLayer.filter(item => item.indexOf('well-') > -1).map(item => item.substring(5))
-        if (wellTypes && wellTypes.length > 0) this.filterMassMarker({ wellTypes: wellTypes }) // 加载海量点
+        if (wellTypes && wellTypes.length > 0) this.filterMassMarker({ wellTypes: wellTypes }, false) // 加载海量点
+        else if (wellTypes && wellTypes.length == 0) this.filterMassMarker({ wellTypes: 'XXX' })
       } else if (this.type === 'cluster') {
         this.filterClusters() // 加载聚合点
       }