diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 94ba7fb..2e34a39 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -253,7 +253,6 @@
     }
   },
   activated() {
-    console.log('alarmRecored actived')
     if (!isFromDetail) {
       if (this.$route.query && this.$route.query.wellCode) {
         this.listQuery.keywords = this.$route.query.wellCode
@@ -265,6 +264,9 @@
         this.listQuery.beginTime = ''
         this.listQuery.endTime = ''
         this.timeRange = []
+        if (!isOperation()) {
+          this.listQuery.alarmType = '1'
+        }
         this.fetchData(false)
       }
     }

diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 94ba7fb..2e34a39 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -253,7 +253,6 @@
     }
   },
   activated() {
-    console.log('alarmRecored actived')
     if (!isFromDetail) {
       if (this.$route.query && this.$route.query.wellCode) {
         this.listQuery.keywords = this.$route.query.wellCode
@@ -265,6 +264,9 @@
         this.listQuery.beginTime = ''
         this.listQuery.endTime = ''
         this.timeRange = []
+        if (!isOperation()) {
+          this.listQuery.alarmType = '1'
+        }
         this.fetchData(false)
       }
     }
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 61ae539..825b4fb 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -16,7 +16,7 @@
         <el-select v-model="listQuery.alarmType" size="small" placeholder="告警类型" clearable>
           <el-option
             v-for="item in alarmTypeList"
-            :key="item.value"
+            :key="'type_'+item.value"
             :label="item.name"
             :value="item.value"
           />
@@ -26,7 +26,7 @@
         <el-select v-model="listQuery.alarmContentType" size="small" :disabled="alarmContentTypeList.length>0?false:true" placeholder="告警内容" clearable="">
           <el-option
             v-for="item in alarmContentTypeList"
-            :key="item.value"
+            :key="'content_'+item.value"
             :label="item.name"
             :value="item.value"
           />
@@ -36,7 +36,7 @@
         <el-select v-model="listQuery.jobStatus" size="small" placeholder="工单状态" clearable>
           <el-option
             v-for="item in jobStatusList"
-            :key="item.value"
+            :key="'status_'+item.value"
             :label="item.name"
             :value="item.value"
           />
@@ -272,7 +272,6 @@
   },
   created() {
     this.fetchAlarmType() // 告警类型下拉菜单
-    this.fetchAlarmContentType() // 告警内容下拉菜单
     this.fetchJobStatus() // 工单状态
     this.fetchData()
   },