diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {

diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()

diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },

diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 48fa7d2..7cdf078 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -16,7 +16,7 @@
 import Card1 from '@/components/BigData/Card1'
 import Card from '@/components/BigData/Card'
 // 首页
-import { getWatchStatistic , waterMeterCount, valveCount } from '@/api/dashboard'
+import { getWatchStatistic, waterMeterCount, valveCount } from '@/api/dashboard'
 // 根据布防数量统计井数量
 import { wellCountByBfzt } from '@/api/well'
 // 当前报警数
@@ -73,7 +73,7 @@
           permission: '/device/list'
         },
         {
-          title: '报警信息',
+          title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
           color: '#f4516c',
@@ -101,11 +101,10 @@
     getWater() {
       // 用水量
       getWatchStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total?parseFloat(response.data.total).toFixed(2):'--', response.data.month?parseFloat(response.data.month).toFixed(2):'--']
-        this.dataGroup1[1].context = [response.data.today?parseFloat(response.data.today).toFixed(2):'--', response.data.prodution?parseFloat(response.data.prodution).toFixed(2):'--']
-        this.dataGroup1[2].context = [response.data.sound?Number(response.data.sound).toFixed(2):'--']
+        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
+        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
+        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-
     },
     // getWellCount() {
     //   wellCountByBfzt().then(response => {
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1a87421..699b56a 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -162,7 +162,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 126df6f..ef519d6 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -124,7 +124,7 @@
 
 export default {
   name: 'ListWaterData',
-  components: {WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
+  components: { WaterHistory, AreaSelectTree, WatchSevenDay, DeptSelect, selectTree },
   data() {
     return {
       listQuery: {
@@ -242,7 +242,7 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === '13' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
       this.fetchData()
@@ -298,7 +298,7 @@
       this.dialogFormVisible = true
       this.$refs.watchsevenday.initDialog(this.dialogFormVisible, row)
     },
-    openData(row){
+    openData(row) {
       this.waterHistoryShow = true
       this.$refs.waterHistory.initDialog(this.waterHistoryShow, row)
     },
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index a3425c4..5437a72 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -247,7 +247,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) // 下载完成移除元素