diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
index d4b88a9..54783cc 100644
--- a/src/views/gasDashboard/components/watchGasAlarmBar.vue
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -24,11 +24,10 @@
         },
         labelMap: {
           'areaName': '分区',
-          'alarm': '报警数',
-          'warning': '预警数'
+          'alarm': '报警数'
         },
         dimension: ['areaName'],
-        metrics: ['alarm', 'warning']
+        metrics: ['alarm']
       },
       grid: {
         right: 40,

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
index d4b88a9..54783cc 100644
--- a/src/views/gasDashboard/components/watchGasAlarmBar.vue
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -24,11 +24,10 @@
         },
         labelMap: {
           'areaName': '分区',
-          'alarm': '报警数',
-          'warning': '预警数'
+          'alarm': '报警数'
         },
         dimension: ['areaName'],
-        metrics: ['alarm', 'warning']
+        metrics: ['alarm']
       },
       grid: {
         right: 40,
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index d2fb0db..89c62d9 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -96,7 +96,6 @@
       })
       console.log(currentList)
       updateNoteList(currentList).then(res => {
-        console.log(res, '======7890')
         this.editMode = false
         this.$message.success('保存成功')
       }).catch(e => {

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
index d4b88a9..54783cc 100644
--- a/src/views/gasDashboard/components/watchGasAlarmBar.vue
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -24,11 +24,10 @@
         },
         labelMap: {
           'areaName': '分区',
-          'alarm': '报警数',
-          'warning': '预警数'
+          'alarm': '报警数'
         },
         dimension: ['areaName'],
-        metrics: ['alarm', 'warning']
+        metrics: ['alarm']
       },
       grid: {
         right: 40,
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index d2fb0db..89c62d9 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -96,7 +96,6 @@
       })
       console.log(currentList)
       updateNoteList(currentList).then(res => {
-        console.log(res, '======7890')
         this.editMode = false
         this.$message.success('保存成功')
       }).catch(e => {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 7b61965..889ed8b 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -94,6 +94,12 @@
 var watch_icon_layer = null // 水表图标层
 var zs_model_layer = null // 噪声模型层
 var zs_icon_layer = null // 噪声图标层
+var rq_model_layer = null // 燃气模型层
+var rq_icon_layer = null // 燃气图标层
+var qt_model_layer = null // 气体流量计模型层
+var qt_icon_layer = null // 气体流量计图标层
+var fs_model_layer = null // 腐蚀速率监测仪模型层
+var fs_icon_layer = null // 腐蚀速率监测仪图标层
 export default {
   name: 'OverviewSimple',
   components: {},
@@ -218,26 +224,60 @@
   methods: {
     // 设备展示
     handleCheckedCitiesChange(val) {
-      console.log(val, '000000000000000000000000000000')
+      console.log(val)
+      if (val.length === 0) {
+        window.map.removeLayer(zs_model_layer)
+        window.map.removeLayer(fs_model_layer)
+        window.map.removeLayer(rq_model_layer)
+        window.map.removeLayer(qt_model_layer)
+        window.map.removeLayer(zs_icon_layer)
+        window.map.removeLayer(fs_icon_layer)
+        window.map.removeLayer(rq_icon_layer)
+        window.map.removeLayer(qt_icon_layer)
+        window.map.removeLayer(well_model_layer)
+      }
       val.forEach(item => {
-        if (item.indexOf('远传水表') === -1) {
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
+        // if (item.indexOf('腐蚀速率监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.fsModel()
+        // } else if (item.indexOf('气体流量计') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.qtModel()
+        // } else if (item.indexOf('气体泄露监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.rqModel()
+        // } else 
+        if (item.indexOf('供水泄露监测仪') === -1) {
+          window.map.removeLayer(rq_model_layer)
+          window.map.removeLayer(qt_model_layer)
+          window.map.removeLayer(fs_model_layer)
+          window.map.removeLayer(rq_icon_layer)
+          window.map.removeLayer(qt_icon_layer)
+          window.map.removeLayer(fs_icon_layer)
           window.map.removeLayer(well_model_layer)
           this.wellMode()
-          this.zsMoel()
-        } else if (item.indexOf('供水泄露监测仪') === -1) {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(well_model_layer)
-          this.wellMode()
-          this.watchModel()
-        } else {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
-          window.map.removeLayer(well_model_layer)
+          this.zsModel()
         }
       })
     },
@@ -388,9 +428,12 @@
     // 初始化井，设备
     async initPoints() {
       this.wellMode()
-      this.watchModel()
       this.zsMoel()
+      // this.rqModel()
+      // this.qtModel()
+      // this.fsModel()
     },
+    // 井
     wellMode() {
       // 井
       getMapping(this.listQuery.keywords).then(response => {
@@ -470,6 +513,124 @@
         }
       })
     },
+    // 腐蚀速率监测仪
+    fsModel() {
+      const params = '14'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (fs_model_layer !== null) window.map.removeLayer(fs_model_layer)
+          fs_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_model_layer)
+
+          if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer)
+          fs_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/fs.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/fs.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体流量计
+    qtModel() {
+      const params = '15'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (qt_model_layer !== null) window.map.removeLayer(qt_model_layer)
+          qt_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_model_layer)
+
+          if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer)
+          qt_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/qt.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/qt.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体泄露监测仪（原燃气）
+    rqModel() {
+      const params = '4'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (rq_model_layer !== null) window.map.removeLayer(rq_model_layer)
+          rq_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_model_layer)
+
+          if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer)
+          rq_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/rq.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/rq.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 供水泄露监测仪（原噪声）
     zsMoel() {
       const params = '8'
       getMapping(params, this.listQuery.keywords).then(response => {
@@ -489,7 +650,7 @@
                 scale: 1,
                 heading: 90
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
             zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
               id: response.data[i].devcode,
@@ -501,7 +662,7 @@
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                 scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
           }
           this.refreshAlarm()
@@ -558,7 +719,7 @@
           this.alarmList = response.data
           if (this.alarmList.length > 0) {
             this.hasAlarm = true
-          } 
+          }
           for (const alarm of response.data) {
             for (const watch of watch_icon_layer.graphics) {
               if (alarm.devcode === watch.options.id) {

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
index d4b88a9..54783cc 100644
--- a/src/views/gasDashboard/components/watchGasAlarmBar.vue
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -24,11 +24,10 @@
         },
         labelMap: {
           'areaName': '分区',
-          'alarm': '报警数',
-          'warning': '预警数'
+          'alarm': '报警数'
         },
         dimension: ['areaName'],
-        metrics: ['alarm', 'warning']
+        metrics: ['alarm']
       },
       grid: {
         right: 40,
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index d2fb0db..89c62d9 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -96,7 +96,6 @@
       })
       console.log(currentList)
       updateNoteList(currentList).then(res => {
-        console.log(res, '======7890')
         this.editMode = false
         this.$message.success('保存成功')
       }).catch(e => {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 7b61965..889ed8b 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -94,6 +94,12 @@
 var watch_icon_layer = null // 水表图标层
 var zs_model_layer = null // 噪声模型层
 var zs_icon_layer = null // 噪声图标层
+var rq_model_layer = null // 燃气模型层
+var rq_icon_layer = null // 燃气图标层
+var qt_model_layer = null // 气体流量计模型层
+var qt_icon_layer = null // 气体流量计图标层
+var fs_model_layer = null // 腐蚀速率监测仪模型层
+var fs_icon_layer = null // 腐蚀速率监测仪图标层
 export default {
   name: 'OverviewSimple',
   components: {},
@@ -218,26 +224,60 @@
   methods: {
     // 设备展示
     handleCheckedCitiesChange(val) {
-      console.log(val, '000000000000000000000000000000')
+      console.log(val)
+      if (val.length === 0) {
+        window.map.removeLayer(zs_model_layer)
+        window.map.removeLayer(fs_model_layer)
+        window.map.removeLayer(rq_model_layer)
+        window.map.removeLayer(qt_model_layer)
+        window.map.removeLayer(zs_icon_layer)
+        window.map.removeLayer(fs_icon_layer)
+        window.map.removeLayer(rq_icon_layer)
+        window.map.removeLayer(qt_icon_layer)
+        window.map.removeLayer(well_model_layer)
+      }
       val.forEach(item => {
-        if (item.indexOf('远传水表') === -1) {
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
+        // if (item.indexOf('腐蚀速率监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.fsModel()
+        // } else if (item.indexOf('气体流量计') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.qtModel()
+        // } else if (item.indexOf('气体泄露监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.rqModel()
+        // } else 
+        if (item.indexOf('供水泄露监测仪') === -1) {
+          window.map.removeLayer(rq_model_layer)
+          window.map.removeLayer(qt_model_layer)
+          window.map.removeLayer(fs_model_layer)
+          window.map.removeLayer(rq_icon_layer)
+          window.map.removeLayer(qt_icon_layer)
+          window.map.removeLayer(fs_icon_layer)
           window.map.removeLayer(well_model_layer)
           this.wellMode()
-          this.zsMoel()
-        } else if (item.indexOf('供水泄露监测仪') === -1) {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(well_model_layer)
-          this.wellMode()
-          this.watchModel()
-        } else {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
-          window.map.removeLayer(well_model_layer)
+          this.zsModel()
         }
       })
     },
@@ -388,9 +428,12 @@
     // 初始化井，设备
     async initPoints() {
       this.wellMode()
-      this.watchModel()
       this.zsMoel()
+      // this.rqModel()
+      // this.qtModel()
+      // this.fsModel()
     },
+    // 井
     wellMode() {
       // 井
       getMapping(this.listQuery.keywords).then(response => {
@@ -470,6 +513,124 @@
         }
       })
     },
+    // 腐蚀速率监测仪
+    fsModel() {
+      const params = '14'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (fs_model_layer !== null) window.map.removeLayer(fs_model_layer)
+          fs_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_model_layer)
+
+          if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer)
+          fs_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/fs.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/fs.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体流量计
+    qtModel() {
+      const params = '15'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (qt_model_layer !== null) window.map.removeLayer(qt_model_layer)
+          qt_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_model_layer)
+
+          if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer)
+          qt_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/qt.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/qt.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体泄露监测仪（原燃气）
+    rqModel() {
+      const params = '4'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (rq_model_layer !== null) window.map.removeLayer(rq_model_layer)
+          rq_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_model_layer)
+
+          if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer)
+          rq_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/rq.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/rq.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 供水泄露监测仪（原噪声）
     zsMoel() {
       const params = '8'
       getMapping(params, this.listQuery.keywords).then(response => {
@@ -489,7 +650,7 @@
                 scale: 1,
                 heading: 90
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
             zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
               id: response.data[i].devcode,
@@ -501,7 +662,7 @@
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                 scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
           }
           this.refreshAlarm()
@@ -558,7 +719,7 @@
           this.alarmList = response.data
           if (this.alarmList.length > 0) {
             this.hasAlarm = true
-          } 
+          }
           for (const alarm of response.data) {
             for (const watch of watch_icon_layer.graphics) {
               if (alarm.devcode === watch.options.id) {
diff --git a/static/images/icon/fs.png b/static/images/icon/fs.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/fs.png
Binary files differ

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
index d4b88a9..54783cc 100644
--- a/src/views/gasDashboard/components/watchGasAlarmBar.vue
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -24,11 +24,10 @@
         },
         labelMap: {
           'areaName': '分区',
-          'alarm': '报警数',
-          'warning': '预警数'
+          'alarm': '报警数'
         },
         dimension: ['areaName'],
-        metrics: ['alarm', 'warning']
+        metrics: ['alarm']
       },
       grid: {
         right: 40,
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index d2fb0db..89c62d9 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -96,7 +96,6 @@
       })
       console.log(currentList)
       updateNoteList(currentList).then(res => {
-        console.log(res, '======7890')
         this.editMode = false
         this.$message.success('保存成功')
       }).catch(e => {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 7b61965..889ed8b 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -94,6 +94,12 @@
 var watch_icon_layer = null // 水表图标层
 var zs_model_layer = null // 噪声模型层
 var zs_icon_layer = null // 噪声图标层
+var rq_model_layer = null // 燃气模型层
+var rq_icon_layer = null // 燃气图标层
+var qt_model_layer = null // 气体流量计模型层
+var qt_icon_layer = null // 气体流量计图标层
+var fs_model_layer = null // 腐蚀速率监测仪模型层
+var fs_icon_layer = null // 腐蚀速率监测仪图标层
 export default {
   name: 'OverviewSimple',
   components: {},
@@ -218,26 +224,60 @@
   methods: {
     // 设备展示
     handleCheckedCitiesChange(val) {
-      console.log(val, '000000000000000000000000000000')
+      console.log(val)
+      if (val.length === 0) {
+        window.map.removeLayer(zs_model_layer)
+        window.map.removeLayer(fs_model_layer)
+        window.map.removeLayer(rq_model_layer)
+        window.map.removeLayer(qt_model_layer)
+        window.map.removeLayer(zs_icon_layer)
+        window.map.removeLayer(fs_icon_layer)
+        window.map.removeLayer(rq_icon_layer)
+        window.map.removeLayer(qt_icon_layer)
+        window.map.removeLayer(well_model_layer)
+      }
       val.forEach(item => {
-        if (item.indexOf('远传水表') === -1) {
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
+        // if (item.indexOf('腐蚀速率监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.fsModel()
+        // } else if (item.indexOf('气体流量计') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.qtModel()
+        // } else if (item.indexOf('气体泄露监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.rqModel()
+        // } else 
+        if (item.indexOf('供水泄露监测仪') === -1) {
+          window.map.removeLayer(rq_model_layer)
+          window.map.removeLayer(qt_model_layer)
+          window.map.removeLayer(fs_model_layer)
+          window.map.removeLayer(rq_icon_layer)
+          window.map.removeLayer(qt_icon_layer)
+          window.map.removeLayer(fs_icon_layer)
           window.map.removeLayer(well_model_layer)
           this.wellMode()
-          this.zsMoel()
-        } else if (item.indexOf('供水泄露监测仪') === -1) {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(well_model_layer)
-          this.wellMode()
-          this.watchModel()
-        } else {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
-          window.map.removeLayer(well_model_layer)
+          this.zsModel()
         }
       })
     },
@@ -388,9 +428,12 @@
     // 初始化井，设备
     async initPoints() {
       this.wellMode()
-      this.watchModel()
       this.zsMoel()
+      // this.rqModel()
+      // this.qtModel()
+      // this.fsModel()
     },
+    // 井
     wellMode() {
       // 井
       getMapping(this.listQuery.keywords).then(response => {
@@ -470,6 +513,124 @@
         }
       })
     },
+    // 腐蚀速率监测仪
+    fsModel() {
+      const params = '14'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (fs_model_layer !== null) window.map.removeLayer(fs_model_layer)
+          fs_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_model_layer)
+
+          if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer)
+          fs_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/fs.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/fs.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体流量计
+    qtModel() {
+      const params = '15'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (qt_model_layer !== null) window.map.removeLayer(qt_model_layer)
+          qt_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_model_layer)
+
+          if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer)
+          qt_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/qt.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/qt.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体泄露监测仪（原燃气）
+    rqModel() {
+      const params = '4'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (rq_model_layer !== null) window.map.removeLayer(rq_model_layer)
+          rq_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_model_layer)
+
+          if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer)
+          rq_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/rq.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/rq.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 供水泄露监测仪（原噪声）
     zsMoel() {
       const params = '8'
       getMapping(params, this.listQuery.keywords).then(response => {
@@ -489,7 +650,7 @@
                 scale: 1,
                 heading: 90
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
             zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
               id: response.data[i].devcode,
@@ -501,7 +662,7 @@
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                 scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
           }
           this.refreshAlarm()
@@ -558,7 +719,7 @@
           this.alarmList = response.data
           if (this.alarmList.length > 0) {
             this.hasAlarm = true
-          } 
+          }
           for (const alarm of response.data) {
             for (const watch of watch_icon_layer.graphics) {
               if (alarm.devcode === watch.options.id) {
diff --git a/static/images/icon/fs.png b/static/images/icon/fs.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/fs.png
Binary files differ
diff --git a/static/images/icon/qt.png b/static/images/icon/qt.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/qt.png
Binary files differ

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
index d4b88a9..54783cc 100644
--- a/src/views/gasDashboard/components/watchGasAlarmBar.vue
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -24,11 +24,10 @@
         },
         labelMap: {
           'areaName': '分区',
-          'alarm': '报警数',
-          'warning': '预警数'
+          'alarm': '报警数'
         },
         dimension: ['areaName'],
-        metrics: ['alarm', 'warning']
+        metrics: ['alarm']
       },
       grid: {
         right: 40,
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index d2fb0db..89c62d9 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -96,7 +96,6 @@
       })
       console.log(currentList)
       updateNoteList(currentList).then(res => {
-        console.log(res, '======7890')
         this.editMode = false
         this.$message.success('保存成功')
       }).catch(e => {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 7b61965..889ed8b 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -94,6 +94,12 @@
 var watch_icon_layer = null // 水表图标层
 var zs_model_layer = null // 噪声模型层
 var zs_icon_layer = null // 噪声图标层
+var rq_model_layer = null // 燃气模型层
+var rq_icon_layer = null // 燃气图标层
+var qt_model_layer = null // 气体流量计模型层
+var qt_icon_layer = null // 气体流量计图标层
+var fs_model_layer = null // 腐蚀速率监测仪模型层
+var fs_icon_layer = null // 腐蚀速率监测仪图标层
 export default {
   name: 'OverviewSimple',
   components: {},
@@ -218,26 +224,60 @@
   methods: {
     // 设备展示
     handleCheckedCitiesChange(val) {
-      console.log(val, '000000000000000000000000000000')
+      console.log(val)
+      if (val.length === 0) {
+        window.map.removeLayer(zs_model_layer)
+        window.map.removeLayer(fs_model_layer)
+        window.map.removeLayer(rq_model_layer)
+        window.map.removeLayer(qt_model_layer)
+        window.map.removeLayer(zs_icon_layer)
+        window.map.removeLayer(fs_icon_layer)
+        window.map.removeLayer(rq_icon_layer)
+        window.map.removeLayer(qt_icon_layer)
+        window.map.removeLayer(well_model_layer)
+      }
       val.forEach(item => {
-        if (item.indexOf('远传水表') === -1) {
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
+        // if (item.indexOf('腐蚀速率监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.fsModel()
+        // } else if (item.indexOf('气体流量计') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.qtModel()
+        // } else if (item.indexOf('气体泄露监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.rqModel()
+        // } else 
+        if (item.indexOf('供水泄露监测仪') === -1) {
+          window.map.removeLayer(rq_model_layer)
+          window.map.removeLayer(qt_model_layer)
+          window.map.removeLayer(fs_model_layer)
+          window.map.removeLayer(rq_icon_layer)
+          window.map.removeLayer(qt_icon_layer)
+          window.map.removeLayer(fs_icon_layer)
           window.map.removeLayer(well_model_layer)
           this.wellMode()
-          this.zsMoel()
-        } else if (item.indexOf('供水泄露监测仪') === -1) {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(well_model_layer)
-          this.wellMode()
-          this.watchModel()
-        } else {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
-          window.map.removeLayer(well_model_layer)
+          this.zsModel()
         }
       })
     },
@@ -388,9 +428,12 @@
     // 初始化井，设备
     async initPoints() {
       this.wellMode()
-      this.watchModel()
       this.zsMoel()
+      // this.rqModel()
+      // this.qtModel()
+      // this.fsModel()
     },
+    // 井
     wellMode() {
       // 井
       getMapping(this.listQuery.keywords).then(response => {
@@ -470,6 +513,124 @@
         }
       })
     },
+    // 腐蚀速率监测仪
+    fsModel() {
+      const params = '14'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (fs_model_layer !== null) window.map.removeLayer(fs_model_layer)
+          fs_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_model_layer)
+
+          if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer)
+          fs_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/fs.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/fs.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体流量计
+    qtModel() {
+      const params = '15'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (qt_model_layer !== null) window.map.removeLayer(qt_model_layer)
+          qt_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_model_layer)
+
+          if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer)
+          qt_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/qt.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/qt.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体泄露监测仪（原燃气）
+    rqModel() {
+      const params = '4'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (rq_model_layer !== null) window.map.removeLayer(rq_model_layer)
+          rq_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_model_layer)
+
+          if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer)
+          rq_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/rq.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/rq.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 供水泄露监测仪（原噪声）
     zsMoel() {
       const params = '8'
       getMapping(params, this.listQuery.keywords).then(response => {
@@ -489,7 +650,7 @@
                 scale: 1,
                 heading: 90
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
             zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
               id: response.data[i].devcode,
@@ -501,7 +662,7 @@
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                 scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
           }
           this.refreshAlarm()
@@ -558,7 +719,7 @@
           this.alarmList = response.data
           if (this.alarmList.length > 0) {
             this.hasAlarm = true
-          } 
+          }
           for (const alarm of response.data) {
             for (const watch of watch_icon_layer.graphics) {
               if (alarm.devcode === watch.options.id) {
diff --git a/static/images/icon/fs.png b/static/images/icon/fs.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/fs.png
Binary files differ
diff --git a/static/images/icon/qt.png b/static/images/icon/qt.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/qt.png
Binary files differ
diff --git a/static/images/icon/rq.png b/static/images/icon/rq.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/rq.png
Binary files differ

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
index d4b88a9..54783cc 100644
--- a/src/views/gasDashboard/components/watchGasAlarmBar.vue
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -24,11 +24,10 @@
         },
         labelMap: {
           'areaName': '分区',
-          'alarm': '报警数',
-          'warning': '预警数'
+          'alarm': '报警数'
         },
         dimension: ['areaName'],
-        metrics: ['alarm', 'warning']
+        metrics: ['alarm']
       },
       grid: {
         right: 40,
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index d2fb0db..89c62d9 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -96,7 +96,6 @@
       })
       console.log(currentList)
       updateNoteList(currentList).then(res => {
-        console.log(res, '======7890')
         this.editMode = false
         this.$message.success('保存成功')
       }).catch(e => {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 7b61965..889ed8b 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -94,6 +94,12 @@
 var watch_icon_layer = null // 水表图标层
 var zs_model_layer = null // 噪声模型层
 var zs_icon_layer = null // 噪声图标层
+var rq_model_layer = null // 燃气模型层
+var rq_icon_layer = null // 燃气图标层
+var qt_model_layer = null // 气体流量计模型层
+var qt_icon_layer = null // 气体流量计图标层
+var fs_model_layer = null // 腐蚀速率监测仪模型层
+var fs_icon_layer = null // 腐蚀速率监测仪图标层
 export default {
   name: 'OverviewSimple',
   components: {},
@@ -218,26 +224,60 @@
   methods: {
     // 设备展示
     handleCheckedCitiesChange(val) {
-      console.log(val, '000000000000000000000000000000')
+      console.log(val)
+      if (val.length === 0) {
+        window.map.removeLayer(zs_model_layer)
+        window.map.removeLayer(fs_model_layer)
+        window.map.removeLayer(rq_model_layer)
+        window.map.removeLayer(qt_model_layer)
+        window.map.removeLayer(zs_icon_layer)
+        window.map.removeLayer(fs_icon_layer)
+        window.map.removeLayer(rq_icon_layer)
+        window.map.removeLayer(qt_icon_layer)
+        window.map.removeLayer(well_model_layer)
+      }
       val.forEach(item => {
-        if (item.indexOf('远传水表') === -1) {
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
+        // if (item.indexOf('腐蚀速率监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.fsModel()
+        // } else if (item.indexOf('气体流量计') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.qtModel()
+        // } else if (item.indexOf('气体泄露监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.rqModel()
+        // } else 
+        if (item.indexOf('供水泄露监测仪') === -1) {
+          window.map.removeLayer(rq_model_layer)
+          window.map.removeLayer(qt_model_layer)
+          window.map.removeLayer(fs_model_layer)
+          window.map.removeLayer(rq_icon_layer)
+          window.map.removeLayer(qt_icon_layer)
+          window.map.removeLayer(fs_icon_layer)
           window.map.removeLayer(well_model_layer)
           this.wellMode()
-          this.zsMoel()
-        } else if (item.indexOf('供水泄露监测仪') === -1) {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(well_model_layer)
-          this.wellMode()
-          this.watchModel()
-        } else {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
-          window.map.removeLayer(well_model_layer)
+          this.zsModel()
         }
       })
     },
@@ -388,9 +428,12 @@
     // 初始化井，设备
     async initPoints() {
       this.wellMode()
-      this.watchModel()
       this.zsMoel()
+      // this.rqModel()
+      // this.qtModel()
+      // this.fsModel()
     },
+    // 井
     wellMode() {
       // 井
       getMapping(this.listQuery.keywords).then(response => {
@@ -470,6 +513,124 @@
         }
       })
     },
+    // 腐蚀速率监测仪
+    fsModel() {
+      const params = '14'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (fs_model_layer !== null) window.map.removeLayer(fs_model_layer)
+          fs_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_model_layer)
+
+          if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer)
+          fs_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/fs.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/fs.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体流量计
+    qtModel() {
+      const params = '15'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (qt_model_layer !== null) window.map.removeLayer(qt_model_layer)
+          qt_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_model_layer)
+
+          if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer)
+          qt_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/qt.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/qt.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体泄露监测仪（原燃气）
+    rqModel() {
+      const params = '4'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (rq_model_layer !== null) window.map.removeLayer(rq_model_layer)
+          rq_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_model_layer)
+
+          if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer)
+          rq_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/rq.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/rq.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 供水泄露监测仪（原噪声）
     zsMoel() {
       const params = '8'
       getMapping(params, this.listQuery.keywords).then(response => {
@@ -489,7 +650,7 @@
                 scale: 1,
                 heading: 90
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
             zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
               id: response.data[i].devcode,
@@ -501,7 +662,7 @@
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                 scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
           }
           this.refreshAlarm()
@@ -558,7 +719,7 @@
           this.alarmList = response.data
           if (this.alarmList.length > 0) {
             this.hasAlarm = true
-          } 
+          }
           for (const alarm of response.data) {
             for (const watch of watch_icon_layer.graphics) {
               if (alarm.devcode === watch.options.id) {
diff --git a/static/images/icon/fs.png b/static/images/icon/fs.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/fs.png
Binary files differ
diff --git a/static/images/icon/qt.png b/static/images/icon/qt.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/qt.png
Binary files differ
diff --git a/static/images/icon/rq.png b/static/images/icon/rq.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/rq.png
Binary files differ
diff --git a/static/model/fs.glb b/static/model/fs.glb
new file mode 100644
index 0000000..17e08b0
--- /dev/null
+++ b/static/model/fs.glb
Binary files differ

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
index d4b88a9..54783cc 100644
--- a/src/views/gasDashboard/components/watchGasAlarmBar.vue
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -24,11 +24,10 @@
         },
         labelMap: {
           'areaName': '分区',
-          'alarm': '报警数',
-          'warning': '预警数'
+          'alarm': '报警数'
         },
         dimension: ['areaName'],
-        metrics: ['alarm', 'warning']
+        metrics: ['alarm']
       },
       grid: {
         right: 40,
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index d2fb0db..89c62d9 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -96,7 +96,6 @@
       })
       console.log(currentList)
       updateNoteList(currentList).then(res => {
-        console.log(res, '======7890')
         this.editMode = false
         this.$message.success('保存成功')
       }).catch(e => {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 7b61965..889ed8b 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -94,6 +94,12 @@
 var watch_icon_layer = null // 水表图标层
 var zs_model_layer = null // 噪声模型层
 var zs_icon_layer = null // 噪声图标层
+var rq_model_layer = null // 燃气模型层
+var rq_icon_layer = null // 燃气图标层
+var qt_model_layer = null // 气体流量计模型层
+var qt_icon_layer = null // 气体流量计图标层
+var fs_model_layer = null // 腐蚀速率监测仪模型层
+var fs_icon_layer = null // 腐蚀速率监测仪图标层
 export default {
   name: 'OverviewSimple',
   components: {},
@@ -218,26 +224,60 @@
   methods: {
     // 设备展示
     handleCheckedCitiesChange(val) {
-      console.log(val, '000000000000000000000000000000')
+      console.log(val)
+      if (val.length === 0) {
+        window.map.removeLayer(zs_model_layer)
+        window.map.removeLayer(fs_model_layer)
+        window.map.removeLayer(rq_model_layer)
+        window.map.removeLayer(qt_model_layer)
+        window.map.removeLayer(zs_icon_layer)
+        window.map.removeLayer(fs_icon_layer)
+        window.map.removeLayer(rq_icon_layer)
+        window.map.removeLayer(qt_icon_layer)
+        window.map.removeLayer(well_model_layer)
+      }
       val.forEach(item => {
-        if (item.indexOf('远传水表') === -1) {
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
+        // if (item.indexOf('腐蚀速率监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.fsModel()
+        // } else if (item.indexOf('气体流量计') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.qtModel()
+        // } else if (item.indexOf('气体泄露监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.rqModel()
+        // } else 
+        if (item.indexOf('供水泄露监测仪') === -1) {
+          window.map.removeLayer(rq_model_layer)
+          window.map.removeLayer(qt_model_layer)
+          window.map.removeLayer(fs_model_layer)
+          window.map.removeLayer(rq_icon_layer)
+          window.map.removeLayer(qt_icon_layer)
+          window.map.removeLayer(fs_icon_layer)
           window.map.removeLayer(well_model_layer)
           this.wellMode()
-          this.zsMoel()
-        } else if (item.indexOf('供水泄露监测仪') === -1) {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(well_model_layer)
-          this.wellMode()
-          this.watchModel()
-        } else {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
-          window.map.removeLayer(well_model_layer)
+          this.zsModel()
         }
       })
     },
@@ -388,9 +428,12 @@
     // 初始化井，设备
     async initPoints() {
       this.wellMode()
-      this.watchModel()
       this.zsMoel()
+      // this.rqModel()
+      // this.qtModel()
+      // this.fsModel()
     },
+    // 井
     wellMode() {
       // 井
       getMapping(this.listQuery.keywords).then(response => {
@@ -470,6 +513,124 @@
         }
       })
     },
+    // 腐蚀速率监测仪
+    fsModel() {
+      const params = '14'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (fs_model_layer !== null) window.map.removeLayer(fs_model_layer)
+          fs_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_model_layer)
+
+          if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer)
+          fs_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/fs.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/fs.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体流量计
+    qtModel() {
+      const params = '15'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (qt_model_layer !== null) window.map.removeLayer(qt_model_layer)
+          qt_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_model_layer)
+
+          if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer)
+          qt_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/qt.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/qt.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体泄露监测仪（原燃气）
+    rqModel() {
+      const params = '4'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (rq_model_layer !== null) window.map.removeLayer(rq_model_layer)
+          rq_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_model_layer)
+
+          if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer)
+          rq_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/rq.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/rq.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 供水泄露监测仪（原噪声）
     zsMoel() {
       const params = '8'
       getMapping(params, this.listQuery.keywords).then(response => {
@@ -489,7 +650,7 @@
                 scale: 1,
                 heading: 90
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
             zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
               id: response.data[i].devcode,
@@ -501,7 +662,7 @@
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                 scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
           }
           this.refreshAlarm()
@@ -558,7 +719,7 @@
           this.alarmList = response.data
           if (this.alarmList.length > 0) {
             this.hasAlarm = true
-          } 
+          }
           for (const alarm of response.data) {
             for (const watch of watch_icon_layer.graphics) {
               if (alarm.devcode === watch.options.id) {
diff --git a/static/images/icon/fs.png b/static/images/icon/fs.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/fs.png
Binary files differ
diff --git a/static/images/icon/qt.png b/static/images/icon/qt.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/qt.png
Binary files differ
diff --git a/static/images/icon/rq.png b/static/images/icon/rq.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/rq.png
Binary files differ
diff --git a/static/model/fs.glb b/static/model/fs.glb
new file mode 100644
index 0000000..17e08b0
--- /dev/null
+++ b/static/model/fs.glb
Binary files differ
diff --git a/static/model/qt.glb b/static/model/qt.glb
new file mode 100644
index 0000000..17e08b0
--- /dev/null
+++ b/static/model/qt.glb
Binary files differ

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 256bfb4..e0b52d4 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -74,11 +74,10 @@
 }
 
 // 用气事记查询
-export function getNoteList(params) {
+export function getNoteList(type) {
   return request({
-    url: '/note/list',
-    method: 'get',
-    params
+    url: '/note/list/' + type,
+    method: 'get'
   })
 }
 
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index 132abd4..f34e15b 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '电量',
           value: 'cell',
@@ -121,16 +121,16 @@
           value: 'uptime',
           align: 'center'
         },
-        {
-          text: '上传时间',
-          value: 'logtime',
-          align: 'center'
-        },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '上传时间',
           value: 'uptime',
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4cd4090..ec5b637 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -101,11 +101,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        {
-          text: '区域全拼',
-          value: 'areaFullName',
-          align: 'center'
-        },
+        // {
+        //   text: '区域全拼',
+        //   value: 'areaFullName',
+        //   align: 'center'
+        // },
         {
           text: '地址',
           value: 'position',
@@ -145,12 +145,12 @@
           text: '采集时间',
           value: 'uptime',
           align: 'center'
-        },
-        {
-          text: '记录时间',
-          value: 'logtime',
-          align: 'center'
         }
+        // {
+        //   text: '记录时间',
+        //   value: 'logtime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/gasDashboard/components/AlarmCountByDept.vue b/src/views/gasDashboard/components/AlarmCountByDept.vue
index c7cd4e3..2d797e7 100644
--- a/src/views/gasDashboard/components/AlarmCountByDept.vue
+++ b/src/views/gasDashboard/components/AlarmCountByDept.vue
@@ -57,7 +57,7 @@
     }
   },
   watch:{
-    query(val){
+    query(val) {
       this.fetchData()
     }
   },
@@ -71,8 +71,3 @@
   }
 }
 </script>
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index 91bafbf..c777fe5 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -44,22 +44,15 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    this.chartData.rows = [
-      { 'deviceType': '气体流量计', 'deviceCount': 20, '下单用户': 1093, '下单率': 0.32 },
-      { 'deviceType': '供水泄露监测仪', 'deviceCount': 20, '下单用户': 3230, '下单率': 0.26 },
-      { 'deviceType': '气体泄露监测仪', 'deviceCount': 50, '下单用户': 2623, '下单率': 0.76 },
-      { 'deviceType': '腐蚀速率监测仪', 'deviceCount': 10, '下单用户': 1423, '下单率': 0.49 }
-    ]
   },
   methods: {
     fetchData() {
       const data = {
-        extra: 1
+        extra: '0'
       }
       deviceStaticsByType(data).then(response => {
-        // this.chartData.rows = response.data
+        this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index 24f9766..3a97391 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -27,7 +27,7 @@
         endTime: ''
       },
       title: {
-        text: '腐蚀速率用气走势图'
+        text: '腐蚀速率走势图'
       },
       chartSettings: {
         labelMap: { date: '日期' },
@@ -39,7 +39,7 @@
           top: 120
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '腐蚀率(%)',
           position: 'left'
         },
         legend: {
diff --git a/src/views/gasDashboard/components/watchGasAlarmBar.vue b/src/views/gasDashboard/components/watchGasAlarmBar.vue
index d4b88a9..54783cc 100644
--- a/src/views/gasDashboard/components/watchGasAlarmBar.vue
+++ b/src/views/gasDashboard/components/watchGasAlarmBar.vue
@@ -24,11 +24,10 @@
         },
         labelMap: {
           'areaName': '分区',
-          'alarm': '报警数',
-          'warning': '预警数'
+          'alarm': '报警数'
         },
         dimension: ['areaName'],
-        metrics: ['alarm', 'warning']
+        metrics: ['alarm']
       },
       grid: {
         right: 40,
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index d2fb0db..89c62d9 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -96,7 +96,6 @@
       })
       console.log(currentList)
       updateNoteList(currentList).then(res => {
-        console.log(res, '======7890')
         this.editMode = false
         this.$message.success('保存成功')
       }).catch(e => {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 7b61965..889ed8b 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -94,6 +94,12 @@
 var watch_icon_layer = null // 水表图标层
 var zs_model_layer = null // 噪声模型层
 var zs_icon_layer = null // 噪声图标层
+var rq_model_layer = null // 燃气模型层
+var rq_icon_layer = null // 燃气图标层
+var qt_model_layer = null // 气体流量计模型层
+var qt_icon_layer = null // 气体流量计图标层
+var fs_model_layer = null // 腐蚀速率监测仪模型层
+var fs_icon_layer = null // 腐蚀速率监测仪图标层
 export default {
   name: 'OverviewSimple',
   components: {},
@@ -218,26 +224,60 @@
   methods: {
     // 设备展示
     handleCheckedCitiesChange(val) {
-      console.log(val, '000000000000000000000000000000')
+      console.log(val)
+      if (val.length === 0) {
+        window.map.removeLayer(zs_model_layer)
+        window.map.removeLayer(fs_model_layer)
+        window.map.removeLayer(rq_model_layer)
+        window.map.removeLayer(qt_model_layer)
+        window.map.removeLayer(zs_icon_layer)
+        window.map.removeLayer(fs_icon_layer)
+        window.map.removeLayer(rq_icon_layer)
+        window.map.removeLayer(qt_icon_layer)
+        window.map.removeLayer(well_model_layer)
+      }
       val.forEach(item => {
-        if (item.indexOf('远传水表') === -1) {
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
+        // if (item.indexOf('腐蚀速率监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.fsModel()
+        // } else if (item.indexOf('气体流量计') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(rq_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(rq_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.qtModel()
+        // } else if (item.indexOf('气体泄露监测仪') === -1) {
+        //   window.map.removeLayer(zs_model_layer)
+        //   window.map.removeLayer(qt_model_layer)
+        //   window.map.removeLayer(fs_model_layer)
+        //   window.map.removeLayer(zs_icon_layer)
+        //   window.map.removeLayer(qt_icon_layer)
+        //   window.map.removeLayer(fs_icon_layer)
+        //   window.map.removeLayer(well_model_layer)
+        //   this.wellMode()
+        //   this.rqModel()
+        // } else 
+        if (item.indexOf('供水泄露监测仪') === -1) {
+          window.map.removeLayer(rq_model_layer)
+          window.map.removeLayer(qt_model_layer)
+          window.map.removeLayer(fs_model_layer)
+          window.map.removeLayer(rq_icon_layer)
+          window.map.removeLayer(qt_icon_layer)
+          window.map.removeLayer(fs_icon_layer)
           window.map.removeLayer(well_model_layer)
           this.wellMode()
-          this.zsMoel()
-        } else if (item.indexOf('供水泄露监测仪') === -1) {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(well_model_layer)
-          this.wellMode()
-          this.watchModel()
-        } else {
-          window.map.removeLayer(zs_model_layer)
-          window.map.removeLayer(zs_icon_layer)
-          window.map.removeLayer(watch_model_layer)
-          window.map.removeLayer(watch_icon_layer)
-          window.map.removeLayer(well_model_layer)
+          this.zsModel()
         }
       })
     },
@@ -388,9 +428,12 @@
     // 初始化井，设备
     async initPoints() {
       this.wellMode()
-      this.watchModel()
       this.zsMoel()
+      // this.rqModel()
+      // this.qtModel()
+      // this.fsModel()
     },
+    // 井
     wellMode() {
       // 井
       getMapping(this.listQuery.keywords).then(response => {
@@ -470,6 +513,124 @@
         }
       })
     },
+    // 腐蚀速率监测仪
+    fsModel() {
+      const params = '14'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (fs_model_layer !== null) window.map.removeLayer(fs_model_layer)
+          fs_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_model_layer)
+
+          if (fs_icon_layer !== null) window.map.removeLayer(fs_icon_layer)
+          fs_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(fs_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            fs_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/fs.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            fs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/fs.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `腐蚀速率监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体流量计
+    qtModel() {
+      const params = '15'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (qt_model_layer !== null) window.map.removeLayer(qt_model_layer)
+          qt_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_model_layer)
+
+          if (qt_icon_layer !== null) window.map.removeLayer(qt_icon_layer)
+          qt_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(qt_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            qt_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/qt.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            qt_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/qt.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体流量计<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 气体泄露监测仪（原燃气）
+    rqModel() {
+      const params = '4'
+      getMapping(params, this.listQuery.keywords).then(response => {
+        if (response.code === 200) {
+          if (rq_model_layer !== null) window.map.removeLayer(rq_model_layer)
+          rq_model_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_model_layer)
+
+          if (rq_icon_layer !== null) window.map.removeLayer(rq_icon_layer)
+          rq_icon_layer = new mars3d.layer.GraphicLayer()
+          window.map.addLayer(rq_icon_layer)
+          for (let i = 0; i < response.data.length; i++) {
+            rq_model_layer.addGraphic(new mars3d.graphic.ModelPrimitive({
+              position: [response.data[i].longitude, response.data[i].latitude, 0],
+              style: {
+                url: '../static/model/rq.glb',
+                scale: 1,
+                heading: 90
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+            rq_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
+              id: response.data[i].devcode,
+              position: [response.data[i].longitude, response.data[i].latitude, 1],
+              style: {
+                image: '../static/images/icon/rq.png',
+                scale: 1,
+                horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
+              },
+              popup: `气体泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+            }))
+          }
+          this.refreshAlarm()
+        }
+      })
+    },
+    // 供水泄露监测仪（原噪声）
     zsMoel() {
       const params = '8'
       getMapping(params, this.listQuery.keywords).then(response => {
@@ -489,7 +650,7 @@
                 scale: 1,
                 heading: 90
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
             zs_icon_layer.addGraphic(new mars3d.graphic.BillboardEntity({
               id: response.data[i].devcode,
@@ -501,7 +662,7 @@
                 verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
                 scaleByDistance: new Cesium.NearFarScalar(10, 1, 2000, 0.3)
               },
-              popup: `噪声记录仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
+              popup: `供水泄露监测仪<br />设备编号：${response.data[i].devcode}<br />设备型号：${response.data[i].modelName}<br />设备类型：${response.data[i].deviceTypeName}<br />井编号：${response.data[i].wellCode}<br />所属单位：${response.data[i].deptName}<br />详细位置：${response.data[i].position}`
             }))
           }
           this.refreshAlarm()
@@ -558,7 +719,7 @@
           this.alarmList = response.data
           if (this.alarmList.length > 0) {
             this.hasAlarm = true
-          } 
+          }
           for (const alarm of response.data) {
             for (const watch of watch_icon_layer.graphics) {
               if (alarm.devcode === watch.options.id) {
diff --git a/static/images/icon/fs.png b/static/images/icon/fs.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/fs.png
Binary files differ
diff --git a/static/images/icon/qt.png b/static/images/icon/qt.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/qt.png
Binary files differ
diff --git a/static/images/icon/rq.png b/static/images/icon/rq.png
new file mode 100644
index 0000000..f63a23c
--- /dev/null
+++ b/static/images/icon/rq.png
Binary files differ
diff --git a/static/model/fs.glb b/static/model/fs.glb
new file mode 100644
index 0000000..17e08b0
--- /dev/null
+++ b/static/model/fs.glb
Binary files differ
diff --git a/static/model/qt.glb b/static/model/qt.glb
new file mode 100644
index 0000000..17e08b0
--- /dev/null
+++ b/static/model/qt.glb
Binary files differ
diff --git a/static/model/rq.glb b/static/model/rq.glb
new file mode 100644
index 0000000..17e08b0
--- /dev/null
+++ b/static/model/rq.glb
Binary files differ