diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 0f6ed2c..bf42b18 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -384,7 +384,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 0f6ed2c..bf42b18 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -384,7 +384,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 14d72fd..27cbea5 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -323,7 +323,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7392a4a..9f5a0b6 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -361,7 +361,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 2e34a39..b5d233c 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -352,7 +352,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/alarmStatics/components/alarmWellRank.vue b/src/views/alarmStatics/components/alarmWellRank.vue
index 89ffa18..acf1598 100644
--- a/src/views/alarmStatics/components/alarmWellRank.vue
+++ b/src/views/alarmStatics/components/alarmWellRank.vue
@@ -75,7 +75,7 @@
       getAlarmContentType('1').then(response => {
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
-          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf('' + item.deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/dataView/components/alarmAnalysis.vue b/src/views/dataView/components/alarmAnalysis.vue
index 3ac21d8..f9949ea 100644
--- a/src/views/dataView/components/alarmAnalysis.vue
+++ b/src/views/dataView/components/alarmAnalysis.vue
@@ -76,7 +76,12 @@
     },
     // 获取各类报警的列表
     fetchAlarmByContent() {
-      alarmStaticsByContent(this.listQuery).then(response => {
+      const query = {
+        alarmType: '1',
+        beginTime: this.listQuery.beginTime,
+        endTime: this.listQuery.endTime
+      }
+      alarmStaticsByContent(query).then(response => {
         this.tableList = response.data
       })
     },
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 0f6ed2c..bf42b18 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -384,7 +384,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/jobManage/listJobsOverTimeGet.vue b/src/views/jobManage/listJobsOverTimeGet.vue
index 14d72fd..27cbea5 100644
--- a/src/views/jobManage/listJobsOverTimeGet.vue
+++ b/src/views/jobManage/listJobsOverTimeGet.vue
@@ -323,7 +323,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }
diff --git a/src/views/jobManage/listJobsOverTimeHandle.vue b/src/views/jobManage/listJobsOverTimeHandle.vue
index 468b9cd..f2d634b 100644
--- a/src/views/jobManage/listJobsOverTimeHandle.vue
+++ b/src/views/jobManage/listJobsOverTimeHandle.vue
@@ -343,7 +343,7 @@
         const supportDeviceTypes = this.$store.getters.deviceTypes
         for (const item of response.data.list) {
           const deviceType = '' + item.deviceType
-          if (supportDeviceTypes.indexOf(deviceType) !== -1) {
+          if (supportDeviceTypes.indexOf(deviceType) !== -1 && this.alarmContentTypeList.findIndex(t => t.name === item.name) === -1) {
             this.alarmContentTypeList.push(item)
           }
         }