diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 7ce6b47..1e33de0 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -66,7 +66,7 @@
       // ]
       // this.originList = JSON.parse(JSON.stringify(this.currentList))
       getNoteList('1').then(response => {
-        this.currentList = JSON.parse(response.data)
+        this.currentList = JSON.parse(response.data[0].notes)
       })
     },
     toTop(index) {

diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 7ce6b47..1e33de0 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -66,7 +66,7 @@
       // ]
       // this.originList = JSON.parse(JSON.stringify(this.currentList))
       getNoteList('1').then(response => {
-        this.currentList = JSON.parse(response.data)
+        this.currentList = JSON.parse(response.data[0].notes)
       })
     },
     toTop(index) {
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index c914f2a..597b6fb 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -188,7 +188,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `腐蚀速率监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 7ce6b47..1e33de0 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -66,7 +66,7 @@
       // ]
       // this.originList = JSON.parse(JSON.stringify(this.currentList))
       getNoteList('1').then(response => {
-        this.currentList = JSON.parse(response.data)
+        this.currentList = JSON.parse(response.data[0].notes)
       })
     },
     toTop(index) {
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index c914f2a..597b6fb 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -188,7 +188,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `腐蚀速率监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4691806..9911132 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -208,7 +208,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体流量计数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 7ce6b47..1e33de0 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -66,7 +66,7 @@
       // ]
       // this.originList = JSON.parse(JSON.stringify(this.currentList))
       getNoteList('1').then(response => {
-        this.currentList = JSON.parse(response.data)
+        this.currentList = JSON.parse(response.data[0].notes)
       })
     },
     toTop(index) {
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index c914f2a..597b6fb 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -188,7 +188,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `腐蚀速率监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4691806..9911132 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -208,7 +208,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体流量计数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index a356a37..42e5e36 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -66,7 +66,7 @@
       // ]
       // this.originList = JSON.parse(JSON.stringify(this.currentList))
       getNoteList('2').then(response => {
-        this.currentList = JSON.parse(response.data)
+        this.currentList = JSON.parse(response.data[0].notes)
       })
     },
     toTop(index) {

diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 7ce6b47..1e33de0 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -66,7 +66,7 @@
       // ]
       // this.originList = JSON.parse(JSON.stringify(this.currentList))
       getNoteList('1').then(response => {
-        this.currentList = JSON.parse(response.data)
+        this.currentList = JSON.parse(response.data[0].notes)
       })
     },
     toTop(index) {
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
index c914f2a..597b6fb 100644
--- a/src/views/dataManage/deviceData/listCorrodeData.vue
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -188,7 +188,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `腐蚀速率监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 4691806..9911132 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -208,7 +208,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体流量计数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/gasDashboard/components/waterNote.vue b/src/views/gasDashboard/components/waterNote.vue
index a356a37..42e5e36 100644
--- a/src/views/gasDashboard/components/waterNote.vue
+++ b/src/views/gasDashboard/components/waterNote.vue
@@ -66,7 +66,7 @@
       // ]
       // this.originList = JSON.parse(JSON.stringify(this.currentList))
       getNoteList('2').then(response => {
-        this.currentList = JSON.parse(response.data)
+        this.currentList = JSON.parse(response.data[0].notes)
       })
     },
     toTop(index) {
diff --git a/src/views/gasOverview/gasOverviewSimple.vue b/src/views/gasOverview/gasOverviewSimple.vue
index 0084ad9..7ddac62 100644
--- a/src/views/gasOverview/gasOverviewSimple.vue
+++ b/src/views/gasOverview/gasOverviewSimple.vue
@@ -273,9 +273,15 @@
     // 获取设备类型
     fetchDeviceType() {
       getDeviceType(this.listQuery).then(response => {
+        console.log(response, '======response======')
         this.deviceTypeList = []
         // 过滤掉该单位不支持的设备类型
         const deviceTypes = this.$store.getters.deviceTypes
+        console.log(deviceTypes, '====deviceTypes======')
+
+        const deptId = this.$store.getters.deptId
+        console.log(deptId, '====deptId=====')
+
         for (const deviceType of response.data) {
           if (deviceTypes.indexOf(deviceType.value) !== -1) {
             this.deviceTypeList.push(deviceType)
@@ -451,7 +457,6 @@
     },
     // 流向线
     addFlow(positions, repeat) {
-      console.log(positions, repeat, '====---1230')
       var style = {}
       if (repeat === 1) {
         style = {