diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 764bf28..8ff468f 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -110,7 +110,7 @@
   data() {
     return {
       screenHeight: null,
-      checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO2气体流量计', 'O2气体流量计', '燃气气体流量计'],
+      checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO₂气体流量计', 'O₂气体流量计', '燃气气体流量计'],
       left: '',
       mapMark: '-',
       deviceTypeList: [], // 设备类型列表
@@ -135,7 +135,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '水表检查井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 120,
           align: 'center'
@@ -252,10 +252,10 @@
         if (item.indexOf('腐蚀速率监测仪') !== -1) {
           this.wellMode()
           this.fsModel()
-        } else if (item.indexOf('CO2气体流量计') !== -1) {
+        } else if (item.indexOf('CO₂气体流量计') !== -1) {
           this.wellMode()
           this.qtModel()
-        } else if (item.indexOf('O2气体流量计') !== -1) {
+        } else if (item.indexOf('O₂气体流量计') !== -1) {
           this.wellMode()
           this.qt02Model()
         } else if (item.indexOf('燃气气体流量计') !== -1) {
@@ -925,32 +925,38 @@
           }
           this.filterAlarmList()
           for (const alarm of response.data) {
-            for (const watch of watch_icon_layer.graphics) {
+            let alarm_layer = []
+            switch (alarm.deviceType) {
+              case '14':
+                alarm_layer = fs_icon_layer
+                break
+              case '15':
+                alarm_layer = qt_icon_layer
+                break
+              case '16':
+                alarm_layer = qt2_icon_layer
+                break
+              case '17':
+                alarm_layer = qt3_icon_layer
+                break
+              case '4':
+                alarm_layer = rq_icon_layer
+                break
+              case '8':
+                alarm_layer = zs_icon_layer
+                break
+            }
+            for (const watch of alarm_layer.graphics) {
               if (alarm.devcode === watch.options.id) {
                 if (!watch.popup.startsWith('报警')) {
                   watch.setStyle({
-                    image: '../static/images/icon/asb.png',
+                    image: watch.options.style.image.replace('.png','b.png'),
                     scale: 1,
                     horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                     verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                     scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
                   })
-                  watch.popup = `报警远程水表<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
-                }
-                break
-              }
-            }
-            for (const zs of zs_icon_layer.graphics) {
-              if (alarm.devcode === zs.options.id) {
-                if (!zs.popup.startsWith('报警')) {
-                  zs.setStyle({
-                    image: '../static/images/icon/azs.png',
-                    scale: 1,
-                    horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-                    verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                    scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
-                  })
-                  zs.popup = `报警噪声记录仪仪<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
+                  watch.popup = `报警设备<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
                 }
                 break
               }
@@ -962,10 +968,30 @@
     // 点击报警列表
     alarmRowClick(row, column, event) {
       if (this.alpha < 10) {
-        this.alpha = 15
-      }
+        this.alpha = 15      }
       let center
-      for (const watch of watch_icon_layer.graphics) {
+      let alarm_layer = []
+      switch (row.deviceType) {
+        case '14':
+          alarm_layer = fs_icon_layer
+          break
+        case '15':
+          alarm_layer = qt_icon_layer
+          break
+        case '16':
+          alarm_layer = qt2_icon_layer
+          break
+        case '17':
+          alarm_layer = qt3_icon_layer
+          break
+        case '4':
+          alarm_layer = rq_icon_layer
+          break
+        case '8':
+          alarm_layer = zs_icon_layer
+          break
+      }
+      for (const watch of alarm_layer.graphics) {
         if (row.devcode === watch.options.id) {
           center = { lat: watch._point._lat, lng: watch._point._lng, alt: 50, heading: 360, pitch: -90 }
           window.map.setCameraView(center)

diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 764bf28..8ff468f 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -110,7 +110,7 @@
   data() {
     return {
       screenHeight: null,
-      checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO2气体流量计', 'O2气体流量计', '燃气气体流量计'],
+      checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO₂气体流量计', 'O₂气体流量计', '燃气气体流量计'],
       left: '',
       mapMark: '-',
       deviceTypeList: [], // 设备类型列表
@@ -135,7 +135,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '水表检查井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 120,
           align: 'center'
@@ -252,10 +252,10 @@
         if (item.indexOf('腐蚀速率监测仪') !== -1) {
           this.wellMode()
           this.fsModel()
-        } else if (item.indexOf('CO2气体流量计') !== -1) {
+        } else if (item.indexOf('CO₂气体流量计') !== -1) {
           this.wellMode()
           this.qtModel()
-        } else if (item.indexOf('O2气体流量计') !== -1) {
+        } else if (item.indexOf('O₂气体流量计') !== -1) {
           this.wellMode()
           this.qt02Model()
         } else if (item.indexOf('燃气气体流量计') !== -1) {
@@ -925,32 +925,38 @@
           }
           this.filterAlarmList()
           for (const alarm of response.data) {
-            for (const watch of watch_icon_layer.graphics) {
+            let alarm_layer = []
+            switch (alarm.deviceType) {
+              case '14':
+                alarm_layer = fs_icon_layer
+                break
+              case '15':
+                alarm_layer = qt_icon_layer
+                break
+              case '16':
+                alarm_layer = qt2_icon_layer
+                break
+              case '17':
+                alarm_layer = qt3_icon_layer
+                break
+              case '4':
+                alarm_layer = rq_icon_layer
+                break
+              case '8':
+                alarm_layer = zs_icon_layer
+                break
+            }
+            for (const watch of alarm_layer.graphics) {
               if (alarm.devcode === watch.options.id) {
                 if (!watch.popup.startsWith('报警')) {
                   watch.setStyle({
-                    image: '../static/images/icon/asb.png',
+                    image: watch.options.style.image.replace('.png','b.png'),
                     scale: 1,
                     horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                     verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                     scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
                   })
-                  watch.popup = `报警远程水表<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
-                }
-                break
-              }
-            }
-            for (const zs of zs_icon_layer.graphics) {
-              if (alarm.devcode === zs.options.id) {
-                if (!zs.popup.startsWith('报警')) {
-                  zs.setStyle({
-                    image: '../static/images/icon/azs.png',
-                    scale: 1,
-                    horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-                    verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                    scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
-                  })
-                  zs.popup = `报警噪声记录仪仪<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
+                  watch.popup = `报警设备<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
                 }
                 break
               }
@@ -962,10 +968,30 @@
     // 点击报警列表
     alarmRowClick(row, column, event) {
       if (this.alpha < 10) {
-        this.alpha = 15
-      }
+        this.alpha = 15      }
       let center
-      for (const watch of watch_icon_layer.graphics) {
+      let alarm_layer = []
+      switch (row.deviceType) {
+        case '14':
+          alarm_layer = fs_icon_layer
+          break
+        case '15':
+          alarm_layer = qt_icon_layer
+          break
+        case '16':
+          alarm_layer = qt2_icon_layer
+          break
+        case '17':
+          alarm_layer = qt3_icon_layer
+          break
+        case '4':
+          alarm_layer = rq_icon_layer
+          break
+        case '8':
+          alarm_layer = zs_icon_layer
+          break
+      }
+      for (const watch of alarm_layer.graphics) {
         if (row.devcode === watch.options.id) {
           center = { lat: watch._point._lat, lng: watch._point._lng, alt: 50, heading: 360, pitch: -90 }
           window.map.setCameraView(center)
diff --git a/static/images/icon/zsb.png b/static/images/icon/zsb.png
index 45d500d..db3adce 100644
--- a/static/images/icon/zsb.png
+++ b/static/images/icon/zsb.png
Binary files differ

diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 764bf28..8ff468f 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -110,7 +110,7 @@
   data() {
     return {
       screenHeight: null,
-      checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO2气体流量计', 'O2气体流量计', '燃气气体流量计'],
+      checkedCities: ['腐蚀速率监测仪', '气体泄漏监测仪', '供水泄漏监测仪', 'CO₂气体流量计', 'O₂气体流量计', '燃气气体流量计'],
       left: '',
       mapMark: '-',
       deviceTypeList: [], // 设备类型列表
@@ -135,7 +135,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '水表检查井编号',
+          text: '井编号',
           value: 'wellCode',
           width: 120,
           align: 'center'
@@ -252,10 +252,10 @@
         if (item.indexOf('腐蚀速率监测仪') !== -1) {
           this.wellMode()
           this.fsModel()
-        } else if (item.indexOf('CO2气体流量计') !== -1) {
+        } else if (item.indexOf('CO₂气体流量计') !== -1) {
           this.wellMode()
           this.qtModel()
-        } else if (item.indexOf('O2气体流量计') !== -1) {
+        } else if (item.indexOf('O₂气体流量计') !== -1) {
           this.wellMode()
           this.qt02Model()
         } else if (item.indexOf('燃气气体流量计') !== -1) {
@@ -925,32 +925,38 @@
           }
           this.filterAlarmList()
           for (const alarm of response.data) {
-            for (const watch of watch_icon_layer.graphics) {
+            let alarm_layer = []
+            switch (alarm.deviceType) {
+              case '14':
+                alarm_layer = fs_icon_layer
+                break
+              case '15':
+                alarm_layer = qt_icon_layer
+                break
+              case '16':
+                alarm_layer = qt2_icon_layer
+                break
+              case '17':
+                alarm_layer = qt3_icon_layer
+                break
+              case '4':
+                alarm_layer = rq_icon_layer
+                break
+              case '8':
+                alarm_layer = zs_icon_layer
+                break
+            }
+            for (const watch of alarm_layer.graphics) {
               if (alarm.devcode === watch.options.id) {
                 if (!watch.popup.startsWith('报警')) {
                   watch.setStyle({
-                    image: '../static/images/icon/asb.png',
+                    image: watch.options.style.image.replace('.png','b.png'),
                     scale: 1,
                     horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                     verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                     scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
                   })
-                  watch.popup = `报警远程水表<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
-                }
-                break
-              }
-            }
-            for (const zs of zs_icon_layer.graphics) {
-              if (alarm.devcode === zs.options.id) {
-                if (!zs.popup.startsWith('报警')) {
-                  zs.setStyle({
-                    image: '../static/images/icon/azs.png',
-                    scale: 1,
-                    horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
-                    verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-                    scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
-                  })
-                  zs.popup = `报警噪声记录仪仪<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
+                  watch.popup = `报警设备<br />设备编号：${alarm.devcode}<br />井编号：${alarm.wellCode}<br />井类型：${alarm.wellTypeName}<br />报警时间：${alarm.alarmTime}<br />报警数值：${alarm.alarmValue}<br />报警内容：${alarm.alarmContent}<br />详细位置：${alarm.position}`
                 }
                 break
               }
@@ -962,10 +968,30 @@
     // 点击报警列表
     alarmRowClick(row, column, event) {
       if (this.alpha < 10) {
-        this.alpha = 15
-      }
+        this.alpha = 15      }
       let center
-      for (const watch of watch_icon_layer.graphics) {
+      let alarm_layer = []
+      switch (row.deviceType) {
+        case '14':
+          alarm_layer = fs_icon_layer
+          break
+        case '15':
+          alarm_layer = qt_icon_layer
+          break
+        case '16':
+          alarm_layer = qt2_icon_layer
+          break
+        case '17':
+          alarm_layer = qt3_icon_layer
+          break
+        case '4':
+          alarm_layer = rq_icon_layer
+          break
+        case '8':
+          alarm_layer = zs_icon_layer
+          break
+      }
+      for (const watch of alarm_layer.graphics) {
         if (row.devcode === watch.options.id) {
           center = { lat: watch._point._lat, lng: watch._point._lng, alt: 50, heading: 360, pitch: -90 }
           window.map.setCameraView(center)
diff --git a/static/images/icon/zsb.png b/static/images/icon/zsb.png
index 45d500d..db3adce 100644
--- a/static/images/icon/zsb.png
+++ b/static/images/icon/zsb.png
Binary files differ
diff --git a/static/images/icon/zsb1.png b/static/images/icon/zsb1.png
new file mode 100644
index 0000000..45d500d
--- /dev/null
+++ b/static/images/icon/zsb1.png
Binary files differ