diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 315c83a..a8006f7 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -57,14 +57,14 @@
         }
       },
       yAxis: {
-        name: '用水量（吨）',
+        name: '用气量（吨）',
         position: 'left'
       },
       series: {
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨' }
     }
     this.grid = {
       right: 40,
@@ -72,7 +72,7 @@
       bottom: 5
     }
     this.title = {
-      text: '分区用水统计图'
+      text: '分区用气统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -81,7 +81,7 @@
 
       labelMap: {
         'areaName': '分区',
-        'count': '用水量'
+        'count': '用气量'
       },
       dimension: ['areaName'],
       metrics: ['count']

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 315c83a..a8006f7 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -57,14 +57,14 @@
         }
       },
       yAxis: {
-        name: '用水量（吨）',
+        name: '用气量（吨）',
         position: 'left'
       },
       series: {
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨' }
     }
     this.grid = {
       right: 40,
@@ -72,7 +72,7 @@
       bottom: 5
     }
     this.title = {
-      text: '分区用水统计图'
+      text: '分区用气统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -81,7 +81,7 @@
 
       labelMap: {
         'areaName': '分区',
-        'count': '用水量'
+        'count': '用气量'
       },
       dimension: ['areaName'],
       metrics: ['count']
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 8d9861e..ebb002c 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -36,7 +36,7 @@
         endTime: ''
       },
       title: {
-        text: '用水走势图'
+        text: '用气走势图'
       },
       chartSettings: {
         labelMap: {date:'日期'},
@@ -48,7 +48,7 @@
           top: 120
         },
         yAxis: {
-          name: '用水量（吨）',
+          name: '用气量（吨）',
           position: 'left'
         },
         legend: {

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 315c83a..a8006f7 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -57,14 +57,14 @@
         }
       },
       yAxis: {
-        name: '用水量（吨）',
+        name: '用气量（吨）',
         position: 'left'
       },
       series: {
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨' }
     }
     this.grid = {
       right: 40,
@@ -72,7 +72,7 @@
       bottom: 5
     }
     this.title = {
-      text: '分区用水统计图'
+      text: '分区用气统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -81,7 +81,7 @@
 
       labelMap: {
         'areaName': '分区',
-        'count': '用水量'
+        'count': '用气量'
       },
       dimension: ['areaName'],
       metrics: ['count']
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 8d9861e..ebb002c 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -36,7 +36,7 @@
         endTime: ''
       },
       title: {
-        text: '用水走势图'
+        text: '用气走势图'
       },
       chartSettings: {
         labelMap: {date:'日期'},
@@ -48,7 +48,7 @@
           top: 120
         },
         yAxis: {
-          name: '用水量（吨）',
+          name: '用气量（吨）',
           position: 'left'
         },
         legend: {
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index 02e27cd..2258847 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -64,15 +64,15 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区用水占比图'
+        text: '分区用气占比图'
       },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
-          'count': '用水量'
+          'count': '用气量'
         },
         dimension: 'areaName',
         metrics: 'count'

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 315c83a..a8006f7 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -57,14 +57,14 @@
         }
       },
       yAxis: {
-        name: '用水量（吨）',
+        name: '用气量（吨）',
         position: 'left'
       },
       series: {
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨' }
     }
     this.grid = {
       right: 40,
@@ -72,7 +72,7 @@
       bottom: 5
     }
     this.title = {
-      text: '分区用水统计图'
+      text: '分区用气统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -81,7 +81,7 @@
 
       labelMap: {
         'areaName': '分区',
-        'count': '用水量'
+        'count': '用气量'
       },
       dimension: ['areaName'],
       metrics: ['count']
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 8d9861e..ebb002c 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -36,7 +36,7 @@
         endTime: ''
       },
       title: {
-        text: '用水走势图'
+        text: '用气走势图'
       },
       chartSettings: {
         labelMap: {date:'日期'},
@@ -48,7 +48,7 @@
           top: 120
         },
         yAxis: {
-          name: '用水量（吨）',
+          name: '用气量（吨）',
           position: 'left'
         },
         legend: {
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index 02e27cd..2258847 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -64,15 +64,15 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区用水占比图'
+        text: '分区用气占比图'
       },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
-          'count': '用水量'
+          'count': '用气量'
         },
         dimension: 'areaName',
         metrics: 'count'
diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 65cdec7..752330a 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <div class="title">
-      场区用水事记
+      场区用气事记
       <i v-if="!editMode" class="el-icon-edit edit-btn" style="float:right" @click="editNote"></i>
       <i v-else class="el-icon-check edit-btn" style="float:right" @click="saveNote"></i>
     </div>

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 315c83a..a8006f7 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -57,14 +57,14 @@
         }
       },
       yAxis: {
-        name: '用水量（吨）',
+        name: '用气量（吨）',
         position: 'left'
       },
       series: {
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨' }
     }
     this.grid = {
       right: 40,
@@ -72,7 +72,7 @@
       bottom: 5
     }
     this.title = {
-      text: '分区用水统计图'
+      text: '分区用气统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -81,7 +81,7 @@
 
       labelMap: {
         'areaName': '分区',
-        'count': '用水量'
+        'count': '用气量'
       },
       dimension: ['areaName'],
       metrics: ['count']
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 8d9861e..ebb002c 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -36,7 +36,7 @@
         endTime: ''
       },
       title: {
-        text: '用水走势图'
+        text: '用气走势图'
       },
       chartSettings: {
         labelMap: {date:'日期'},
@@ -48,7 +48,7 @@
           top: 120
         },
         yAxis: {
-          name: '用水量（吨）',
+          name: '用气量（吨）',
           position: 'left'
         },
         legend: {
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index 02e27cd..2258847 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -64,15 +64,15 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区用水占比图'
+        text: '分区用气占比图'
       },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
-          'count': '用水量'
+          'count': '用气量'
         },
         dimension: 'areaName',
         metrics: 'count'
diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 65cdec7..752330a 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <div class="title">
-      场区用水事记
+      场区用气事记
       <i v-if="!editMode" class="el-icon-edit edit-btn" style="float:right" @click="editNote"></i>
       <i v-else class="el-icon-check edit-btn" style="float:right" @click="saveNote"></i>
     </div>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index b562719..d51bfb7 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,7 +2,7 @@
   <div class="dashboard-container" style="background-color: white">
     <panel-group ref="panelgroup"/>
     <el-row>
-      <!-- 用水统计图 -->
+      <!-- 用气统计图 -->
       <el-col :span="18">
         <el-card shadow="never">
           <water-count-by-area-bar @change="changeWaterQuery"/>
@@ -15,13 +15,13 @@
       </el-col>
     </el-row>
     <el-row>
-      <!-- 分区用水占比图 -->
+      <!-- 分区用气占比图 -->
       <el-col :span="12">
         <el-card shadow="never">
-          <water-count-by-dept :query="listQuery1" ref="waterCountPie"/>
+          <water-count-by-dept :query="listQuery1" ref='waterCountPie'/>
         </el-card>
       </el-col>
-      <!-- 用水走势图 -->
+      <!-- 用气走势图 -->
       <el-col :span="12">
         <el-card shadow="never">
           <water-count-by-day :query="listQuery1" ref="waterCountDay"/>
@@ -39,7 +39,7 @@
           <device-count/>
         </el-card>
       </el-col>
-      <!--水表报警次数统计，柱状图-->
+      <!--气体流量计告警统计，柱状图-->
       <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
         <el-card shadow="never">
           <watch-alarm-bar @change="changeAlarmQuery"/>
@@ -51,6 +51,26 @@
           <alarm-count-by-dept :query="listQuery2"/>
         </el-card>
       </el-col>
+      <!--燃气报警统计，柱状图-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <watch-gas-alarm-bar @change="changeAlarmGasQuery"/>
+        </el-card>
+      </el-col>
+      <!--报警饼图统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <alarm-gas-count-by-dept :query="listQuery3"/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <!-- 腐蚀速率走势图 -->
+      <el-col>
+        <el-card shadow="never">
+          <corrode-count-by-day :query="listQuery1" />
+        </el-card>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -67,11 +87,14 @@
 import WaterCountByDept from './components/waterCountByDept'
 import WaterCountByDeptBar from './components/waterCountByDeptBar'
 import WaterCountByDay from './components/waterCountByDay'
-import WaterCountByAreaBar from "./components/waterCountByAreaBar";
-import WatchAlarmBar from "./components/watchAlarmBar";
-import WaterNote from "./components/waterNote";
-import AlarmCountByDept from "./components/AlarmCountByDept";
-import WaterCompare from "./components/waterCompare";
+import WaterCountByAreaBar from './components/waterCountByAreaBar'
+import WatchAlarmBar from './components/watchAlarmBar'
+import WaterNote from './components/waterNote'
+import AlarmCountByDept from './components/AlarmCountByDept'
+import WaterCompare from './components/waterCompare'
+import watchGasAlarmBar from './components/watchGasAlarmBar'
+import alarmGasCountByDept from './components/alarmGasCountByDept'
+import corrodeCountByDay from './components/corrodeCountByDay'
 
 export default {
   name: 'Dashboard',
@@ -90,7 +113,29 @@
     WellCountByBfzt,
     WellCountByType,
     DeviceCount,
-    DeviceCountByOnline
+    DeviceCountByOnline,
+    watchGasAlarmBar,
+    alarmGasCountByDept,
+    corrodeCountByDay
+  },
+  data() {
+    return {
+      listQuery1: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区用气量查询条件
+      listQuery2: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区报警查询条件
+      listQuery3: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      } // 分区报警查询条件
+    }
   },
   computed: {
     ...mapGetters([
@@ -114,20 +159,6 @@
       state.needRefresh = needRefresh
     }
   },
-  data(){
-    return {
-      listQuery1:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      },// 分区用水量查询条件
-      listQuery2:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      } // 分区报警查询条件
-    }
-  },
   watch: {
     needRefresh(val) {
       // 需要刷新
@@ -145,12 +176,16 @@
       this.$store.dispatch('initWebSocket')
     },
     // 切换分区查询条件
-    changeWaterQuery(listQuery1){
+    changeWaterQuery(listQuery1) {
       this.listQuery1 = listQuery1
     },
     // 切换报警查询条件
-    changeAlarmQuery(listQuery2){
+    changeAlarmQuery(listQuery2) {
       this.listQuery2 = listQuery2
+    },
+    // 切换报警查询条件
+    changeAlarmGasQuery(listQuery3) {
+      this.listQuery3 = listQuery3
     }
   }
 }

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 315c83a..a8006f7 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -57,14 +57,14 @@
         }
       },
       yAxis: {
-        name: '用水量（吨）',
+        name: '用气量（吨）',
         position: 'left'
       },
       series: {
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨' }
     }
     this.grid = {
       right: 40,
@@ -72,7 +72,7 @@
       bottom: 5
     }
     this.title = {
-      text: '分区用水统计图'
+      text: '分区用气统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -81,7 +81,7 @@
 
       labelMap: {
         'areaName': '分区',
-        'count': '用水量'
+        'count': '用气量'
       },
       dimension: ['areaName'],
       metrics: ['count']
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 8d9861e..ebb002c 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -36,7 +36,7 @@
         endTime: ''
       },
       title: {
-        text: '用水走势图'
+        text: '用气走势图'
       },
       chartSettings: {
         labelMap: {date:'日期'},
@@ -48,7 +48,7 @@
           top: 120
         },
         yAxis: {
-          name: '用水量（吨）',
+          name: '用气量（吨）',
           position: 'left'
         },
         legend: {
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index 02e27cd..2258847 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -64,15 +64,15 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区用水占比图'
+        text: '分区用气占比图'
       },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
-          'count': '用水量'
+          'count': '用气量'
         },
         dimension: 'areaName',
         metrics: 'count'
diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 65cdec7..752330a 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <div class="title">
-      场区用水事记
+      场区用气事记
       <i v-if="!editMode" class="el-icon-edit edit-btn" style="float:right" @click="editNote"></i>
       <i v-else class="el-icon-check edit-btn" style="float:right" @click="saveNote"></i>
     </div>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index b562719..d51bfb7 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,7 +2,7 @@
   <div class="dashboard-container" style="background-color: white">
     <panel-group ref="panelgroup"/>
     <el-row>
-      <!-- 用水统计图 -->
+      <!-- 用气统计图 -->
       <el-col :span="18">
         <el-card shadow="never">
           <water-count-by-area-bar @change="changeWaterQuery"/>
@@ -15,13 +15,13 @@
       </el-col>
     </el-row>
     <el-row>
-      <!-- 分区用水占比图 -->
+      <!-- 分区用气占比图 -->
       <el-col :span="12">
         <el-card shadow="never">
-          <water-count-by-dept :query="listQuery1" ref="waterCountPie"/>
+          <water-count-by-dept :query="listQuery1" ref='waterCountPie'/>
         </el-card>
       </el-col>
-      <!-- 用水走势图 -->
+      <!-- 用气走势图 -->
       <el-col :span="12">
         <el-card shadow="never">
           <water-count-by-day :query="listQuery1" ref="waterCountDay"/>
@@ -39,7 +39,7 @@
           <device-count/>
         </el-card>
       </el-col>
-      <!--水表报警次数统计，柱状图-->
+      <!--气体流量计告警统计，柱状图-->
       <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
         <el-card shadow="never">
           <watch-alarm-bar @change="changeAlarmQuery"/>
@@ -51,6 +51,26 @@
           <alarm-count-by-dept :query="listQuery2"/>
         </el-card>
       </el-col>
+      <!--燃气报警统计，柱状图-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <watch-gas-alarm-bar @change="changeAlarmGasQuery"/>
+        </el-card>
+      </el-col>
+      <!--报警饼图统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <alarm-gas-count-by-dept :query="listQuery3"/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <!-- 腐蚀速率走势图 -->
+      <el-col>
+        <el-card shadow="never">
+          <corrode-count-by-day :query="listQuery1" />
+        </el-card>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -67,11 +87,14 @@
 import WaterCountByDept from './components/waterCountByDept'
 import WaterCountByDeptBar from './components/waterCountByDeptBar'
 import WaterCountByDay from './components/waterCountByDay'
-import WaterCountByAreaBar from "./components/waterCountByAreaBar";
-import WatchAlarmBar from "./components/watchAlarmBar";
-import WaterNote from "./components/waterNote";
-import AlarmCountByDept from "./components/AlarmCountByDept";
-import WaterCompare from "./components/waterCompare";
+import WaterCountByAreaBar from './components/waterCountByAreaBar'
+import WatchAlarmBar from './components/watchAlarmBar'
+import WaterNote from './components/waterNote'
+import AlarmCountByDept from './components/AlarmCountByDept'
+import WaterCompare from './components/waterCompare'
+import watchGasAlarmBar from './components/watchGasAlarmBar'
+import alarmGasCountByDept from './components/alarmGasCountByDept'
+import corrodeCountByDay from './components/corrodeCountByDay'
 
 export default {
   name: 'Dashboard',
@@ -90,7 +113,29 @@
     WellCountByBfzt,
     WellCountByType,
     DeviceCount,
-    DeviceCountByOnline
+    DeviceCountByOnline,
+    watchGasAlarmBar,
+    alarmGasCountByDept,
+    corrodeCountByDay
+  },
+  data() {
+    return {
+      listQuery1: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区用气量查询条件
+      listQuery2: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区报警查询条件
+      listQuery3: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      } // 分区报警查询条件
+    }
   },
   computed: {
     ...mapGetters([
@@ -114,20 +159,6 @@
       state.needRefresh = needRefresh
     }
   },
-  data(){
-    return {
-      listQuery1:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      },// 分区用水量查询条件
-      listQuery2:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      } // 分区报警查询条件
-    }
-  },
   watch: {
     needRefresh(val) {
       // 需要刷新
@@ -145,12 +176,16 @@
       this.$store.dispatch('initWebSocket')
     },
     // 切换分区查询条件
-    changeWaterQuery(listQuery1){
+    changeWaterQuery(listQuery1) {
       this.listQuery1 = listQuery1
     },
     // 切换报警查询条件
-    changeAlarmQuery(listQuery2){
+    changeAlarmQuery(listQuery2) {
       this.listQuery2 = listQuery2
+    },
+    // 切换报警查询条件
+    changeAlarmGasQuery(listQuery3) {
+      this.listQuery3 = listQuery3
     }
   }
 }
diff --git a/src/views/dashboard/index_bak2.vue b/src/views/dashboard/index_bak2.vue
new file mode 100644
index 0000000..b562719
--- /dev/null
+++ b/src/views/dashboard/index_bak2.vue
@@ -0,0 +1,176 @@
+<template>
+  <div class="dashboard-container" style="background-color: white">
+    <panel-group ref="panelgroup"/>
+    <el-row>
+      <!-- 用水统计图 -->
+      <el-col :span="18">
+        <el-card shadow="never">
+          <water-count-by-area-bar @change="changeWaterQuery"/>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card shadow="never">
+          <water-note/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <!-- 分区用水占比图 -->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-count-by-dept :query="listQuery1" ref="waterCountPie"/>
+        </el-card>
+      </el-col>
+      <!-- 用水走势图 -->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-count-by-day :query="listQuery1" ref="waterCountDay"/>
+        </el-card>
+      </el-col>
+      <!--设备在线数量统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-compare/>
+        </el-card>
+      </el-col>
+      <!--设备数量统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <device-count/>
+        </el-card>
+      </el-col>
+      <!--水表报警次数统计，柱状图-->
+      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+        <el-card shadow="never">
+          <watch-alarm-bar @change="changeAlarmQuery"/>
+        </el-card>
+      </el-col>
+      <!--报警饼图统计-->
+      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+        <el-card shadow="never">
+          <alarm-count-by-dept :query="listQuery2"/>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import PanelGroup from './components/PanelGroup'
+import WellCountByBfzt from './components/WellCountByBfzt'
+import WellCountByType from './components/WellCountByType'
+import DeviceCount from './components/DeviceCount'
+import DeviceCountByOnline from './components/DeviceCountByOnline'
+import AlarmByDays from './components/AlarmByDays'
+import JobByStatus from './components/JobByStatus'
+import WaterCountByDept from './components/waterCountByDept'
+import WaterCountByDeptBar from './components/waterCountByDeptBar'
+import WaterCountByDay from './components/waterCountByDay'
+import WaterCountByAreaBar from "./components/waterCountByAreaBar";
+import WatchAlarmBar from "./components/watchAlarmBar";
+import WaterNote from "./components/waterNote";
+import AlarmCountByDept from "./components/AlarmCountByDept";
+import WaterCompare from "./components/waterCompare";
+
+export default {
+  name: 'Dashboard',
+  components: {
+    WaterCompare,
+    AlarmCountByDept,
+    WaterNote,
+    WatchAlarmBar,
+    WaterCountByAreaBar,
+    WaterCountByDay,
+    WaterCountByDeptBar,
+    WaterCountByDept,
+    JobByStatus,
+    AlarmByDays,
+    PanelGroup,
+    WellCountByBfzt,
+    WellCountByType,
+    DeviceCount,
+    DeviceCountByOnline
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'roleNames',
+      'roleTips',
+      'wellTypes',
+      'deviceTypes',
+      'communications',
+      'area'
+    ])
+  },
+  mutations: {
+    SET_WEBSOCKET: (state, websocket) => {
+      state.websocket = websocket
+    },
+    SET_WS_STATUS: (state, wsStatus) => {
+      state.wsStatus = wsStatus
+    },
+    SET_NEED_REFRESH: (state, needRefresh) => {
+      state.needRefresh = needRefresh
+    }
+  },
+  data(){
+    return {
+      listQuery1:{
+        areaId:'110000',
+        startTime:new Date().Format('yyyy-MM-dd'),
+        endTime:new Date().Format('yyyy-MM-dd')
+      },// 分区用水量查询条件
+      listQuery2:{
+        areaId:'110000',
+        startTime:new Date().Format('yyyy-MM-dd'),
+        endTime:new Date().Format('yyyy-MM-dd')
+      } // 分区报警查询条件
+    }
+  },
+  watch: {
+    needRefresh(val) {
+      // 需要刷新
+      if (val) {
+        console.log('refresh dashboard')
+        this.$refs.panelgroup.refresh()
+      }
+    }
+  },
+  mounted() {
+    // this.webSocket()
+  },
+  methods: {
+    webSocket() {
+      this.$store.dispatch('initWebSocket')
+    },
+    // 切换分区查询条件
+    changeWaterQuery(listQuery1){
+      this.listQuery1 = listQuery1
+    },
+    // 切换报警查询条件
+    changeAlarmQuery(listQuery2){
+      this.listQuery2 = listQuery2
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dashboard-container{
+  .el-row{
+    .el-col{
+      margin-bottom: 10px;
+    }
+  }
+}
+.dashboard {
+  &-container {
+    padding: 10px 20px;
+  }
+  &-text {
+    font-size: 30px;
+    line-height: 46px;
+  }
+}
+</style>

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 315c83a..a8006f7 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -57,14 +57,14 @@
         }
       },
       yAxis: {
-        name: '用水量（吨）',
+        name: '用气量（吨）',
         position: 'left'
       },
       series: {
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨' }
     }
     this.grid = {
       right: 40,
@@ -72,7 +72,7 @@
       bottom: 5
     }
     this.title = {
-      text: '分区用水统计图'
+      text: '分区用气统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -81,7 +81,7 @@
 
       labelMap: {
         'areaName': '分区',
-        'count': '用水量'
+        'count': '用气量'
       },
       dimension: ['areaName'],
       metrics: ['count']
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 8d9861e..ebb002c 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -36,7 +36,7 @@
         endTime: ''
       },
       title: {
-        text: '用水走势图'
+        text: '用气走势图'
       },
       chartSettings: {
         labelMap: {date:'日期'},
@@ -48,7 +48,7 @@
           top: 120
         },
         yAxis: {
-          name: '用水量（吨）',
+          name: '用气量（吨）',
           position: 'left'
         },
         legend: {
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index 02e27cd..2258847 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -64,15 +64,15 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区用水占比图'
+        text: '分区用气占比图'
       },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
-          'count': '用水量'
+          'count': '用气量'
         },
         dimension: 'areaName',
         metrics: 'count'
diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 65cdec7..752330a 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <div class="title">
-      场区用水事记
+      场区用气事记
       <i v-if="!editMode" class="el-icon-edit edit-btn" style="float:right" @click="editNote"></i>
       <i v-else class="el-icon-check edit-btn" style="float:right" @click="saveNote"></i>
     </div>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index b562719..d51bfb7 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,7 +2,7 @@
   <div class="dashboard-container" style="background-color: white">
     <panel-group ref="panelgroup"/>
     <el-row>
-      <!-- 用水统计图 -->
+      <!-- 用气统计图 -->
       <el-col :span="18">
         <el-card shadow="never">
           <water-count-by-area-bar @change="changeWaterQuery"/>
@@ -15,13 +15,13 @@
       </el-col>
     </el-row>
     <el-row>
-      <!-- 分区用水占比图 -->
+      <!-- 分区用气占比图 -->
       <el-col :span="12">
         <el-card shadow="never">
-          <water-count-by-dept :query="listQuery1" ref="waterCountPie"/>
+          <water-count-by-dept :query="listQuery1" ref='waterCountPie'/>
         </el-card>
       </el-col>
-      <!-- 用水走势图 -->
+      <!-- 用气走势图 -->
       <el-col :span="12">
         <el-card shadow="never">
           <water-count-by-day :query="listQuery1" ref="waterCountDay"/>
@@ -39,7 +39,7 @@
           <device-count/>
         </el-card>
       </el-col>
-      <!--水表报警次数统计，柱状图-->
+      <!--气体流量计告警统计，柱状图-->
       <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
         <el-card shadow="never">
           <watch-alarm-bar @change="changeAlarmQuery"/>
@@ -51,6 +51,26 @@
           <alarm-count-by-dept :query="listQuery2"/>
         </el-card>
       </el-col>
+      <!--燃气报警统计，柱状图-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <watch-gas-alarm-bar @change="changeAlarmGasQuery"/>
+        </el-card>
+      </el-col>
+      <!--报警饼图统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <alarm-gas-count-by-dept :query="listQuery3"/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <!-- 腐蚀速率走势图 -->
+      <el-col>
+        <el-card shadow="never">
+          <corrode-count-by-day :query="listQuery1" />
+        </el-card>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -67,11 +87,14 @@
 import WaterCountByDept from './components/waterCountByDept'
 import WaterCountByDeptBar from './components/waterCountByDeptBar'
 import WaterCountByDay from './components/waterCountByDay'
-import WaterCountByAreaBar from "./components/waterCountByAreaBar";
-import WatchAlarmBar from "./components/watchAlarmBar";
-import WaterNote from "./components/waterNote";
-import AlarmCountByDept from "./components/AlarmCountByDept";
-import WaterCompare from "./components/waterCompare";
+import WaterCountByAreaBar from './components/waterCountByAreaBar'
+import WatchAlarmBar from './components/watchAlarmBar'
+import WaterNote from './components/waterNote'
+import AlarmCountByDept from './components/AlarmCountByDept'
+import WaterCompare from './components/waterCompare'
+import watchGasAlarmBar from './components/watchGasAlarmBar'
+import alarmGasCountByDept from './components/alarmGasCountByDept'
+import corrodeCountByDay from './components/corrodeCountByDay'
 
 export default {
   name: 'Dashboard',
@@ -90,7 +113,29 @@
     WellCountByBfzt,
     WellCountByType,
     DeviceCount,
-    DeviceCountByOnline
+    DeviceCountByOnline,
+    watchGasAlarmBar,
+    alarmGasCountByDept,
+    corrodeCountByDay
+  },
+  data() {
+    return {
+      listQuery1: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区用气量查询条件
+      listQuery2: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区报警查询条件
+      listQuery3: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      } // 分区报警查询条件
+    }
   },
   computed: {
     ...mapGetters([
@@ -114,20 +159,6 @@
       state.needRefresh = needRefresh
     }
   },
-  data(){
-    return {
-      listQuery1:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      },// 分区用水量查询条件
-      listQuery2:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      } // 分区报警查询条件
-    }
-  },
   watch: {
     needRefresh(val) {
       // 需要刷新
@@ -145,12 +176,16 @@
       this.$store.dispatch('initWebSocket')
     },
     // 切换分区查询条件
-    changeWaterQuery(listQuery1){
+    changeWaterQuery(listQuery1) {
       this.listQuery1 = listQuery1
     },
     // 切换报警查询条件
-    changeAlarmQuery(listQuery2){
+    changeAlarmQuery(listQuery2) {
       this.listQuery2 = listQuery2
+    },
+    // 切换报警查询条件
+    changeAlarmGasQuery(listQuery3) {
+      this.listQuery3 = listQuery3
     }
   }
 }
diff --git a/src/views/dashboard/index_bak2.vue b/src/views/dashboard/index_bak2.vue
new file mode 100644
index 0000000..b562719
--- /dev/null
+++ b/src/views/dashboard/index_bak2.vue
@@ -0,0 +1,176 @@
+<template>
+  <div class="dashboard-container" style="background-color: white">
+    <panel-group ref="panelgroup"/>
+    <el-row>
+      <!-- 用水统计图 -->
+      <el-col :span="18">
+        <el-card shadow="never">
+          <water-count-by-area-bar @change="changeWaterQuery"/>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card shadow="never">
+          <water-note/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <!-- 分区用水占比图 -->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-count-by-dept :query="listQuery1" ref="waterCountPie"/>
+        </el-card>
+      </el-col>
+      <!-- 用水走势图 -->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-count-by-day :query="listQuery1" ref="waterCountDay"/>
+        </el-card>
+      </el-col>
+      <!--设备在线数量统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-compare/>
+        </el-card>
+      </el-col>
+      <!--设备数量统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <device-count/>
+        </el-card>
+      </el-col>
+      <!--水表报警次数统计，柱状图-->
+      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+        <el-card shadow="never">
+          <watch-alarm-bar @change="changeAlarmQuery"/>
+        </el-card>
+      </el-col>
+      <!--报警饼图统计-->
+      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+        <el-card shadow="never">
+          <alarm-count-by-dept :query="listQuery2"/>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import PanelGroup from './components/PanelGroup'
+import WellCountByBfzt from './components/WellCountByBfzt'
+import WellCountByType from './components/WellCountByType'
+import DeviceCount from './components/DeviceCount'
+import DeviceCountByOnline from './components/DeviceCountByOnline'
+import AlarmByDays from './components/AlarmByDays'
+import JobByStatus from './components/JobByStatus'
+import WaterCountByDept from './components/waterCountByDept'
+import WaterCountByDeptBar from './components/waterCountByDeptBar'
+import WaterCountByDay from './components/waterCountByDay'
+import WaterCountByAreaBar from "./components/waterCountByAreaBar";
+import WatchAlarmBar from "./components/watchAlarmBar";
+import WaterNote from "./components/waterNote";
+import AlarmCountByDept from "./components/AlarmCountByDept";
+import WaterCompare from "./components/waterCompare";
+
+export default {
+  name: 'Dashboard',
+  components: {
+    WaterCompare,
+    AlarmCountByDept,
+    WaterNote,
+    WatchAlarmBar,
+    WaterCountByAreaBar,
+    WaterCountByDay,
+    WaterCountByDeptBar,
+    WaterCountByDept,
+    JobByStatus,
+    AlarmByDays,
+    PanelGroup,
+    WellCountByBfzt,
+    WellCountByType,
+    DeviceCount,
+    DeviceCountByOnline
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'roleNames',
+      'roleTips',
+      'wellTypes',
+      'deviceTypes',
+      'communications',
+      'area'
+    ])
+  },
+  mutations: {
+    SET_WEBSOCKET: (state, websocket) => {
+      state.websocket = websocket
+    },
+    SET_WS_STATUS: (state, wsStatus) => {
+      state.wsStatus = wsStatus
+    },
+    SET_NEED_REFRESH: (state, needRefresh) => {
+      state.needRefresh = needRefresh
+    }
+  },
+  data(){
+    return {
+      listQuery1:{
+        areaId:'110000',
+        startTime:new Date().Format('yyyy-MM-dd'),
+        endTime:new Date().Format('yyyy-MM-dd')
+      },// 分区用水量查询条件
+      listQuery2:{
+        areaId:'110000',
+        startTime:new Date().Format('yyyy-MM-dd'),
+        endTime:new Date().Format('yyyy-MM-dd')
+      } // 分区报警查询条件
+    }
+  },
+  watch: {
+    needRefresh(val) {
+      // 需要刷新
+      if (val) {
+        console.log('refresh dashboard')
+        this.$refs.panelgroup.refresh()
+      }
+    }
+  },
+  mounted() {
+    // this.webSocket()
+  },
+  methods: {
+    webSocket() {
+      this.$store.dispatch('initWebSocket')
+    },
+    // 切换分区查询条件
+    changeWaterQuery(listQuery1){
+      this.listQuery1 = listQuery1
+    },
+    // 切换报警查询条件
+    changeAlarmQuery(listQuery2){
+      this.listQuery2 = listQuery2
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dashboard-container{
+  .el-row{
+    .el-col{
+      margin-bottom: 10px;
+    }
+  }
+}
+.dashboard {
+  &-container {
+    padding: 10px 20px;
+  }
+  &-text {
+    font-size: 30px;
+    line-height: 46px;
+  }
+}
+</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index ea6926c..addba3d 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -7,13 +7,13 @@
       <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
         <list-liquid-data ref="liquiddatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
+      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="气体泄漏监测仪" name="gas">
         <list-gas-data ref="gasdatacomp"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
         <list-dig-data ref="digdatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
+      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="供水泄露监测仪" name="noise">
         <list-noise-data ref="noisedatacomp"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
@@ -25,9 +25,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
-      <el-tab-pane label="远传水表" name="water">
+      <el-tab-pane v-if="hasPerm('/waterMeterData/listPage')" label="远传水表" name="water">
         <list-water-data ref="waterdatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/corrodedata/list')" label="腐蚀速率监测仪" name="corrode">
+        <list-corrode-data ref="corrodetacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/gasflowdata/list')" label="气体流量计" name="gasflow">
+        <list-gasflow-data ref="gasflowcomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -40,6 +46,8 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListCorrodeData from './deviceData/listCorrodeData'
+import ListGasflowData from './deviceData/listGasflowData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
@@ -47,7 +55,19 @@
 
 export default {
   name: 'DataManage',
-  components: { ListWaterData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: {
+    ListWaterData,
+    ListNoiseData,
+    ListWellLocaData,
+    ListTempData,
+    ListHarmfulData,
+    ListDigData,
+    ListGasData,
+    ListLiquidData,
+    ListWellCoverData,
+    ListCorrodeData,
+    ListGasflowData
+  },
   data() {
     return {
       activeName: 'water'
@@ -90,11 +110,16 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'waater') {
+      } else if (tab.name === 'water') {
         this.$refs.waterdatacomp.fetchData()
+      } else if (tab.name === 'corrode') {
+        this.$refs.corrodetacomp.fetchData()
+      } else if (tab.name === 'gasflow') {
+        this.$refs.gasflowcomp.fetchData()
       }
     },
     changeTab(deviceType) {
+      console.log(deviceType)
       if (deviceType === '1') {
         this.activeName = 'wellcover'
       } else if (deviceType === '2') {
@@ -111,8 +136,12 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
-      } else if (deviceType === '10') {
+      } else if (deviceType === '9') {
         this.activeName = 'water'
+      } else if (deviceType === '10') {
+        this.activeName = 'corrode'
+      } else if (deviceType === '11') {
+        this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
@@ -133,6 +162,10 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/corrodedata/list')) {
+        this.activeName = 'corrode'
+      } else if (hasPermission('/gasflowdata/list')) {
+        this.activeName = 'gasflow'
       } else {
         this.activeName = 'water'
       }

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 315c83a..a8006f7 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -57,14 +57,14 @@
         }
       },
       yAxis: {
-        name: '用水量（吨）',
+        name: '用气量（吨）',
         position: 'left'
       },
       series: {
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨' }
     }
     this.grid = {
       right: 40,
@@ -72,7 +72,7 @@
       bottom: 5
     }
     this.title = {
-      text: '分区用水统计图'
+      text: '分区用气统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -81,7 +81,7 @@
 
       labelMap: {
         'areaName': '分区',
-        'count': '用水量'
+        'count': '用气量'
       },
       dimension: ['areaName'],
       metrics: ['count']
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 8d9861e..ebb002c 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -36,7 +36,7 @@
         endTime: ''
       },
       title: {
-        text: '用水走势图'
+        text: '用气走势图'
       },
       chartSettings: {
         labelMap: {date:'日期'},
@@ -48,7 +48,7 @@
           top: 120
         },
         yAxis: {
-          name: '用水量（吨）',
+          name: '用气量（吨）',
           position: 'left'
         },
         legend: {
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index 02e27cd..2258847 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -64,15 +64,15 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区用水占比图'
+        text: '分区用气占比图'
       },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
-          'count': '用水量'
+          'count': '用气量'
         },
         dimension: 'areaName',
         metrics: 'count'
diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 65cdec7..752330a 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <div class="title">
-      场区用水事记
+      场区用气事记
       <i v-if="!editMode" class="el-icon-edit edit-btn" style="float:right" @click="editNote"></i>
       <i v-else class="el-icon-check edit-btn" style="float:right" @click="saveNote"></i>
     </div>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index b562719..d51bfb7 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,7 +2,7 @@
   <div class="dashboard-container" style="background-color: white">
     <panel-group ref="panelgroup"/>
     <el-row>
-      <!-- 用水统计图 -->
+      <!-- 用气统计图 -->
       <el-col :span="18">
         <el-card shadow="never">
           <water-count-by-area-bar @change="changeWaterQuery"/>
@@ -15,13 +15,13 @@
       </el-col>
     </el-row>
     <el-row>
-      <!-- 分区用水占比图 -->
+      <!-- 分区用气占比图 -->
       <el-col :span="12">
         <el-card shadow="never">
-          <water-count-by-dept :query="listQuery1" ref="waterCountPie"/>
+          <water-count-by-dept :query="listQuery1" ref='waterCountPie'/>
         </el-card>
       </el-col>
-      <!-- 用水走势图 -->
+      <!-- 用气走势图 -->
       <el-col :span="12">
         <el-card shadow="never">
           <water-count-by-day :query="listQuery1" ref="waterCountDay"/>
@@ -39,7 +39,7 @@
           <device-count/>
         </el-card>
       </el-col>
-      <!--水表报警次数统计，柱状图-->
+      <!--气体流量计告警统计，柱状图-->
       <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
         <el-card shadow="never">
           <watch-alarm-bar @change="changeAlarmQuery"/>
@@ -51,6 +51,26 @@
           <alarm-count-by-dept :query="listQuery2"/>
         </el-card>
       </el-col>
+      <!--燃气报警统计，柱状图-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <watch-gas-alarm-bar @change="changeAlarmGasQuery"/>
+        </el-card>
+      </el-col>
+      <!--报警饼图统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <alarm-gas-count-by-dept :query="listQuery3"/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <!-- 腐蚀速率走势图 -->
+      <el-col>
+        <el-card shadow="never">
+          <corrode-count-by-day :query="listQuery1" />
+        </el-card>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -67,11 +87,14 @@
 import WaterCountByDept from './components/waterCountByDept'
 import WaterCountByDeptBar from './components/waterCountByDeptBar'
 import WaterCountByDay from './components/waterCountByDay'
-import WaterCountByAreaBar from "./components/waterCountByAreaBar";
-import WatchAlarmBar from "./components/watchAlarmBar";
-import WaterNote from "./components/waterNote";
-import AlarmCountByDept from "./components/AlarmCountByDept";
-import WaterCompare from "./components/waterCompare";
+import WaterCountByAreaBar from './components/waterCountByAreaBar'
+import WatchAlarmBar from './components/watchAlarmBar'
+import WaterNote from './components/waterNote'
+import AlarmCountByDept from './components/AlarmCountByDept'
+import WaterCompare from './components/waterCompare'
+import watchGasAlarmBar from './components/watchGasAlarmBar'
+import alarmGasCountByDept from './components/alarmGasCountByDept'
+import corrodeCountByDay from './components/corrodeCountByDay'
 
 export default {
   name: 'Dashboard',
@@ -90,7 +113,29 @@
     WellCountByBfzt,
     WellCountByType,
     DeviceCount,
-    DeviceCountByOnline
+    DeviceCountByOnline,
+    watchGasAlarmBar,
+    alarmGasCountByDept,
+    corrodeCountByDay
+  },
+  data() {
+    return {
+      listQuery1: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区用气量查询条件
+      listQuery2: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区报警查询条件
+      listQuery3: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      } // 分区报警查询条件
+    }
   },
   computed: {
     ...mapGetters([
@@ -114,20 +159,6 @@
       state.needRefresh = needRefresh
     }
   },
-  data(){
-    return {
-      listQuery1:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      },// 分区用水量查询条件
-      listQuery2:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      } // 分区报警查询条件
-    }
-  },
   watch: {
     needRefresh(val) {
       // 需要刷新
@@ -145,12 +176,16 @@
       this.$store.dispatch('initWebSocket')
     },
     // 切换分区查询条件
-    changeWaterQuery(listQuery1){
+    changeWaterQuery(listQuery1) {
       this.listQuery1 = listQuery1
     },
     // 切换报警查询条件
-    changeAlarmQuery(listQuery2){
+    changeAlarmQuery(listQuery2) {
       this.listQuery2 = listQuery2
+    },
+    // 切换报警查询条件
+    changeAlarmGasQuery(listQuery3) {
+      this.listQuery3 = listQuery3
     }
   }
 }
diff --git a/src/views/dashboard/index_bak2.vue b/src/views/dashboard/index_bak2.vue
new file mode 100644
index 0000000..b562719
--- /dev/null
+++ b/src/views/dashboard/index_bak2.vue
@@ -0,0 +1,176 @@
+<template>
+  <div class="dashboard-container" style="background-color: white">
+    <panel-group ref="panelgroup"/>
+    <el-row>
+      <!-- 用水统计图 -->
+      <el-col :span="18">
+        <el-card shadow="never">
+          <water-count-by-area-bar @change="changeWaterQuery"/>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card shadow="never">
+          <water-note/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <!-- 分区用水占比图 -->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-count-by-dept :query="listQuery1" ref="waterCountPie"/>
+        </el-card>
+      </el-col>
+      <!-- 用水走势图 -->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-count-by-day :query="listQuery1" ref="waterCountDay"/>
+        </el-card>
+      </el-col>
+      <!--设备在线数量统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-compare/>
+        </el-card>
+      </el-col>
+      <!--设备数量统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <device-count/>
+        </el-card>
+      </el-col>
+      <!--水表报警次数统计，柱状图-->
+      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+        <el-card shadow="never">
+          <watch-alarm-bar @change="changeAlarmQuery"/>
+        </el-card>
+      </el-col>
+      <!--报警饼图统计-->
+      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+        <el-card shadow="never">
+          <alarm-count-by-dept :query="listQuery2"/>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import PanelGroup from './components/PanelGroup'
+import WellCountByBfzt from './components/WellCountByBfzt'
+import WellCountByType from './components/WellCountByType'
+import DeviceCount from './components/DeviceCount'
+import DeviceCountByOnline from './components/DeviceCountByOnline'
+import AlarmByDays from './components/AlarmByDays'
+import JobByStatus from './components/JobByStatus'
+import WaterCountByDept from './components/waterCountByDept'
+import WaterCountByDeptBar from './components/waterCountByDeptBar'
+import WaterCountByDay from './components/waterCountByDay'
+import WaterCountByAreaBar from "./components/waterCountByAreaBar";
+import WatchAlarmBar from "./components/watchAlarmBar";
+import WaterNote from "./components/waterNote";
+import AlarmCountByDept from "./components/AlarmCountByDept";
+import WaterCompare from "./components/waterCompare";
+
+export default {
+  name: 'Dashboard',
+  components: {
+    WaterCompare,
+    AlarmCountByDept,
+    WaterNote,
+    WatchAlarmBar,
+    WaterCountByAreaBar,
+    WaterCountByDay,
+    WaterCountByDeptBar,
+    WaterCountByDept,
+    JobByStatus,
+    AlarmByDays,
+    PanelGroup,
+    WellCountByBfzt,
+    WellCountByType,
+    DeviceCount,
+    DeviceCountByOnline
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'roleNames',
+      'roleTips',
+      'wellTypes',
+      'deviceTypes',
+      'communications',
+      'area'
+    ])
+  },
+  mutations: {
+    SET_WEBSOCKET: (state, websocket) => {
+      state.websocket = websocket
+    },
+    SET_WS_STATUS: (state, wsStatus) => {
+      state.wsStatus = wsStatus
+    },
+    SET_NEED_REFRESH: (state, needRefresh) => {
+      state.needRefresh = needRefresh
+    }
+  },
+  data(){
+    return {
+      listQuery1:{
+        areaId:'110000',
+        startTime:new Date().Format('yyyy-MM-dd'),
+        endTime:new Date().Format('yyyy-MM-dd')
+      },// 分区用水量查询条件
+      listQuery2:{
+        areaId:'110000',
+        startTime:new Date().Format('yyyy-MM-dd'),
+        endTime:new Date().Format('yyyy-MM-dd')
+      } // 分区报警查询条件
+    }
+  },
+  watch: {
+    needRefresh(val) {
+      // 需要刷新
+      if (val) {
+        console.log('refresh dashboard')
+        this.$refs.panelgroup.refresh()
+      }
+    }
+  },
+  mounted() {
+    // this.webSocket()
+  },
+  methods: {
+    webSocket() {
+      this.$store.dispatch('initWebSocket')
+    },
+    // 切换分区查询条件
+    changeWaterQuery(listQuery1){
+      this.listQuery1 = listQuery1
+    },
+    // 切换报警查询条件
+    changeAlarmQuery(listQuery2){
+      this.listQuery2 = listQuery2
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dashboard-container{
+  .el-row{
+    .el-col{
+      margin-bottom: 10px;
+    }
+  }
+}
+.dashboard {
+  &-container {
+    padding: 10px 20px;
+  }
+  &-text {
+    font-size: 30px;
+    line-height: 46px;
+  }
+}
+</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index ea6926c..addba3d 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -7,13 +7,13 @@
       <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
         <list-liquid-data ref="liquiddatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
+      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="气体泄漏监测仪" name="gas">
         <list-gas-data ref="gasdatacomp"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
         <list-dig-data ref="digdatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
+      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="供水泄露监测仪" name="noise">
         <list-noise-data ref="noisedatacomp"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
@@ -25,9 +25,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
-      <el-tab-pane label="远传水表" name="water">
+      <el-tab-pane v-if="hasPerm('/waterMeterData/listPage')" label="远传水表" name="water">
         <list-water-data ref="waterdatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/corrodedata/list')" label="腐蚀速率监测仪" name="corrode">
+        <list-corrode-data ref="corrodetacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/gasflowdata/list')" label="气体流量计" name="gasflow">
+        <list-gasflow-data ref="gasflowcomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -40,6 +46,8 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListCorrodeData from './deviceData/listCorrodeData'
+import ListGasflowData from './deviceData/listGasflowData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
@@ -47,7 +55,19 @@
 
 export default {
   name: 'DataManage',
-  components: { ListWaterData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: {
+    ListWaterData,
+    ListNoiseData,
+    ListWellLocaData,
+    ListTempData,
+    ListHarmfulData,
+    ListDigData,
+    ListGasData,
+    ListLiquidData,
+    ListWellCoverData,
+    ListCorrodeData,
+    ListGasflowData
+  },
   data() {
     return {
       activeName: 'water'
@@ -90,11 +110,16 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'waater') {
+      } else if (tab.name === 'water') {
         this.$refs.waterdatacomp.fetchData()
+      } else if (tab.name === 'corrode') {
+        this.$refs.corrodetacomp.fetchData()
+      } else if (tab.name === 'gasflow') {
+        this.$refs.gasflowcomp.fetchData()
       }
     },
     changeTab(deviceType) {
+      console.log(deviceType)
       if (deviceType === '1') {
         this.activeName = 'wellcover'
       } else if (deviceType === '2') {
@@ -111,8 +136,12 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
-      } else if (deviceType === '10') {
+      } else if (deviceType === '9') {
         this.activeName = 'water'
+      } else if (deviceType === '10') {
+        this.activeName = 'corrode'
+      } else if (deviceType === '11') {
+        this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
@@ -133,6 +162,10 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/corrodedata/list')) {
+        this.activeName = 'corrode'
+      } else if (hasPermission('/gasflowdata/list')) {
+        this.activeName = 'gasflow'
       } else {
         this.activeName = 'water'
       }
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..fbb44a0
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/noisedata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getNoiseData, batchExportNoiseData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+
+export default {
+  name: 'ListCorrodeData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '腐蚀速率(mm/a)',
+          value: 'corrode',
+          align: 'center'
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        // {
+        //   text: '状态描述',
+        //   value: 'descn',
+        //   width: 80,
+        //   align: 'center',
+        //   checkCell: true
+        // },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 开挖配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '8' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportNoiseData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取开挖配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getNoiseData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>

diff --git a/package.json b/package.json
index be3e56e..a60e7b3 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index 503102f..491f1e6 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -112,7 +112,7 @@
         devcode: '', // 设备编号
         deviceType: '', // 设备类型
         highValue: '', // 告警上限
-        lowValue: '0',// 告警下限
+        lowValue: '0', // 告警下限
         warnValue: '' // 预警上限
       }, // 表单
       textMap: {
@@ -140,7 +140,7 @@
       return true
     },
     showLowValue() {
-      if (this.alarmRuleForm.deviceType === '13') {
+      if (this.alarmRuleForm.deviceType === '13' || this.alarmRuleForm.deviceType === '15') {
         return true
       } else {
         return false
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 3a8bb47..b5428ab 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -9,10 +9,11 @@
       <search-item v-if="showDeviceType" >
         <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
           <el-option
-          v-for="item in deviceTypeList"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"/>
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
         </el-select>
       </search-item>
       <search-item>
@@ -76,7 +77,7 @@
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
 import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListRule',
@@ -86,8 +87,8 @@
       listQuery: {
         keywords: '',
         status: '',
-        deviceType:'',
-        areaId:'',
+        deviceType: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: '',
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 4347727..4395df9 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -44,10 +44,10 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        // tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区水表报警占比图'
+        text: '分区气体流量计报警占比'
       },
       chartSettings: {
         labelMap: {
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index cbacc0f..30fa639 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -46,20 +46,17 @@
   mounted() {
     // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deviceType': '井盖状态监测仪', 'deviceCount': 1393, '下单用户': 1093, '下单率': 0.32 },
-    //   { 'deviceType': '液位监测仪', 'deviceCount': 3530, '下单用户': 3230, '下单率': 0.26 },
-    //   { 'deviceType': '燃气智能监测终端', 'deviceCount': 2923, '下单用户': 2623, '下单率': 0.76 },
-    //   { 'deviceType': '开挖监测仪', 'deviceCount': 1723, '下单用户': 1423, '下单率': 0.49 },
-    //   { 'deviceType': '有害气体监测仪', 'deviceCount': 3792, '下单用户': 3492, '下单率': 0.323 },
-    //   { 'deviceType': '水质监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 },
-    //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
-    // ]
+    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() {
       deviceStaticsByType().then(response => {
-        this.chartData.rows = response.data
+        // this.chartData.rows = response.data
       })
     }
   }
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index 7cdf078..2232a6f 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -32,7 +32,7 @@
     return {
       dataGroup1: [
         {
-          title: ['总用水量', '本月用水量'],
+          title: ['总用气量', '本月用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#40c9c6',
@@ -40,7 +40,7 @@
           index: 0
         },
         {
-          title: ['今日用水量', '生产厂区用水量'],
+          title: ['今日用气量', '生产厂区用气量'],
           context: ['--', '--'],
           icon: '',
           color: '#36a3f7',
@@ -58,14 +58,7 @@
       ],
       dataGroup: [
         {
-          title: '阀门数量',
-          context: '--',
-          icon: 'icon-valve',
-          color: '#40c9c6',
-          permission: '/device/list'
-        },
-        {
-          title: '水表数量',
+          title: '气体流量计',
           context: '--',
           icon: 'icon-watch',
           color: '#9694f7',
@@ -99,7 +92,7 @@
       this.$router.push(path)
     },
     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) : '--']
diff --git a/src/views/dashboard/components/alarmGasCountByDept.vue b/src/views/dashboard/components/alarmGasCountByDept.vue
new file mode 100644
index 0000000..534d8f3
--- /dev/null
+++ b/src/views/dashboard/components/alarmGasCountByDept.vue
@@ -0,0 +1,73 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <div style="height: 28px;margin-bottom: 10px;"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+
+  </div>
+</template>
+
+<script>
+import { alarmBySecondArea } from '@/api/overview'
+export default {
+  name: 'AlarmGasCountByDept',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      },
+      extend: {
+        grid: {
+          right: '30%'
+        },
+        legend: {
+          type: 'scroll',
+          top: '60px',
+          right: '0px',
+          orient: 'vertical'
+        },
+        series: {
+          label: { show: true, position: 'outside', formatter: '{b}' },
+          right: 120
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
+      },
+      title: {
+        text: '分区燃气报警占比'
+      },
+      chartSettings: {
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数'
+        }
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取统计数据
+    fetchData() {
+      alarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/corrodeCountByDay.vue b/src/views/dashboard/components/corrodeCountByDay.vue
new file mode 100644
index 0000000..8563956
--- /dev/null
+++ b/src/views/dashboard/components/corrodeCountByDay.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="container">
+    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { countByDaySecond } from '@/api/dashboard'
+export default {
+  name: 'WaterCountByDay',
+  props: {
+    query: {
+      type: Object,
+      default: () => {
+        return {
+          areaId: '',
+          startTime: '',
+          endTime: ''
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      listQuery: {
+        startTime: '',
+        endTime: ''
+      },
+      title: {
+        text: '用气走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '用气量（吨）',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  watch: {
+    query(val) {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      countByDaySecond(this.query).then(response => {
+        if (response.data.length > 0) {
+          const arr = response.data.map((item) => {
+            const result = { date: item.date }
+            for (let i = 0; i < item.data.length; i++) {
+              result[item.data[i].areaName] = item.data[i].count
+            }
+            return result
+          })
+          const area = response.data[0].data.map(item => item.areaName)
+          this.chartData.columns = ['date', ...area]
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = arr
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 5fe709d..dbf30c7 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,4 +1,4 @@
-<!--水表告警统计-->
+<!--气体流量计告警统计-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -45,7 +45,7 @@
   data() {
     return {
       title:{
-        text: '水表告警统计'
+        text: '气体流量计告警统计'
       },
       chartSettings:{
         itemStyle: {
diff --git a/src/views/dashboard/components/watchGasAlarmBar.vue b/src/views/dashboard/components/watchGasAlarmBar.vue
new file mode 100644
index 0000000..ae7266e
--- /dev/null
+++ b/src/views/dashboard/components/watchGasAlarmBar.vue
@@ -0,0 +1,150 @@
+<!--气体流量计告警统计-->
+<template>
+  <div class="container">
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+// 引入视觉映射组件
+import 'echarts/lib/component/visualMap'
+import { alarmBySecondArea } from '@/api/overview'
+import functionArea from './FunctionArea'
+export default {
+  name: 'WatchGasAlarmBar',
+  components: { functionArea },
+  data() {
+    return {
+      title: {
+        text: '燃气告警统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 0
+        },
+        labelMap: {
+          'areaName': '分区',
+          'alarm': '报警数',
+          'warning': '预警数'
+        },
+        dimension: ['areaName'],
+        metrics: ['alarm', 'warning']
+      },
+      grid: {
+        right: 40,
+        top: 80,
+        bottom: 5
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left',
+          max: 10
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 20
+        }
+        // tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
+      },
+      areaId: '',
+      areaList: [],
+      isShow: true,
+      defaultTimeRange: [],
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
+          }
+        }
+      },
+      chartData: {
+        columns: ['areaName', 'alarm'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
+    // this.fetchArea()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        areaId: '110000',
+        startTime: timeRange[0],
+        endTime: timeRange[1]
+      }
+      this.$emit('change', params)
+      alarmBySecondArea(params).then(response => {
+        this.isShow = false
+        this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(item => { return item.alarm > item.warning ? item.alarm : item.warning }))
+        if (maxValue < 10) {
+          this.extend.yAxis.max = 10
+        } else {
+          this.extend.yAxis.max = maxValue + 1
+        }
+        this.isShow = true
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      width:calc(100% - 120px);
+      height: 28px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+  .statistic-container {
+
+    .el-button{
+      padding: 5px 10px;
+    }
+    margin-bottom: 10px;
+    text-align: center;
+    .chart-tool-button {
+      padding: 5px;
+      line-height: 16px;
+      margin-top: 5px;
+      font-size: 14px;
+    }
+    .chart-tool-button:hover {
+      background-color: #8cc5ff;
+      cursor: pointer;
+      color: white;
+    }
+    .chart-tool-button:active {
+      background-color: #8cc5ff;
+      color: white;
+    }
+  }
+  .selected {
+    background-color: #8cc5ff;
+    color: white;
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 6a62089..5f7d7c8 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -1,4 +1,4 @@
-<!--分区用水对比图-->
+<!--分区用气对比图-->
 <template>
   <div class="container">
     <function-area ref="func" select="week" @change="fetchData"/>
@@ -18,7 +18,7 @@
   components: { FunctionArea },
   data() {
     return {
-      title: { text: '分区用水对比图' },
+      title: { text: '分区用气对比' },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
@@ -47,7 +47,7 @@
           }
         },
         yAxis: {
-          name: '用水量(吨)',
+          name: '用气量(吨)',
           position: 'left',
           max: 10
         },
@@ -66,12 +66,12 @@
         rows: []
       },
       nameDict: {
-        'today': ['昨日用水', '今日用水'],
-        'week': ['近7日用水', '对照时间用水'],
-        'month': ['近30日用水', '对照时间用水'],
-        'season': ['上季度用水', '本季度用水'],
-        'year': ['上年度用水', '本年度用水'],
-        'other': ['对照时间用水', '自选时间用水']
+        'today': ['昨日用气', '今日用气'],
+        'week': ['近7日用气', '对照时间用气'],
+        'month': ['近30日用气', '对照时间用气'],
+        'season': ['上季度用气', '本季度用气'],
+        'year': ['上年度用气', '本年度用气'],
+        'other': ['对照时间用气', '自选时间用气']
       }
     }
   },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 315c83a..a8006f7 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -57,14 +57,14 @@
         }
       },
       yAxis: {
-        name: '用水量（吨）',
+        name: '用气量（吨）',
         position: 'left'
       },
       series: {
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨' }
     }
     this.grid = {
       right: 40,
@@ -72,7 +72,7 @@
       bottom: 5
     }
     this.title = {
-      text: '分区用水统计图'
+      text: '分区用气统计'
     }
     this.chartSettings = {
       itemStyle: {
@@ -81,7 +81,7 @@
 
       labelMap: {
         'areaName': '分区',
-        'count': '用水量'
+        'count': '用气量'
       },
       dimension: ['areaName'],
       metrics: ['count']
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 8d9861e..ebb002c 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -36,7 +36,7 @@
         endTime: ''
       },
       title: {
-        text: '用水走势图'
+        text: '用气走势图'
       },
       chartSettings: {
         labelMap: {date:'日期'},
@@ -48,7 +48,7 @@
           top: 120
         },
         yAxis: {
-          name: '用水量（吨）',
+          name: '用气量（吨）',
           position: 'left'
         },
         legend: {
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index 02e27cd..2258847 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -64,15 +64,15 @@
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
         },
-        tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%' }
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}吨<br/>占比：{d}%' }
       },
       title: {
-        text: '分区用水占比图'
+        text: '分区用气占比图'
       },
       chartSettings: {
         labelMap: {
           'areaName': '分区',
-          'count': '用水量'
+          'count': '用气量'
         },
         dimension: 'areaName',
         metrics: 'count'
diff --git a/src/views/dashboard/components/waterNote.vue b/src/views/dashboard/components/waterNote.vue
index 65cdec7..752330a 100644
--- a/src/views/dashboard/components/waterNote.vue
+++ b/src/views/dashboard/components/waterNote.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <div class="title">
-      场区用水事记
+      场区用气事记
       <i v-if="!editMode" class="el-icon-edit edit-btn" style="float:right" @click="editNote"></i>
       <i v-else class="el-icon-check edit-btn" style="float:right" @click="saveNote"></i>
     </div>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index b562719..d51bfb7 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,7 +2,7 @@
   <div class="dashboard-container" style="background-color: white">
     <panel-group ref="panelgroup"/>
     <el-row>
-      <!-- 用水统计图 -->
+      <!-- 用气统计图 -->
       <el-col :span="18">
         <el-card shadow="never">
           <water-count-by-area-bar @change="changeWaterQuery"/>
@@ -15,13 +15,13 @@
       </el-col>
     </el-row>
     <el-row>
-      <!-- 分区用水占比图 -->
+      <!-- 分区用气占比图 -->
       <el-col :span="12">
         <el-card shadow="never">
-          <water-count-by-dept :query="listQuery1" ref="waterCountPie"/>
+          <water-count-by-dept :query="listQuery1" ref='waterCountPie'/>
         </el-card>
       </el-col>
-      <!-- 用水走势图 -->
+      <!-- 用气走势图 -->
       <el-col :span="12">
         <el-card shadow="never">
           <water-count-by-day :query="listQuery1" ref="waterCountDay"/>
@@ -39,7 +39,7 @@
           <device-count/>
         </el-card>
       </el-col>
-      <!--水表报警次数统计，柱状图-->
+      <!--气体流量计告警统计，柱状图-->
       <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
         <el-card shadow="never">
           <watch-alarm-bar @change="changeAlarmQuery"/>
@@ -51,6 +51,26 @@
           <alarm-count-by-dept :query="listQuery2"/>
         </el-card>
       </el-col>
+      <!--燃气报警统计，柱状图-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <watch-gas-alarm-bar @change="changeAlarmGasQuery"/>
+        </el-card>
+      </el-col>
+      <!--报警饼图统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <alarm-gas-count-by-dept :query="listQuery3"/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <!-- 腐蚀速率走势图 -->
+      <el-col>
+        <el-card shadow="never">
+          <corrode-count-by-day :query="listQuery1" />
+        </el-card>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -67,11 +87,14 @@
 import WaterCountByDept from './components/waterCountByDept'
 import WaterCountByDeptBar from './components/waterCountByDeptBar'
 import WaterCountByDay from './components/waterCountByDay'
-import WaterCountByAreaBar from "./components/waterCountByAreaBar";
-import WatchAlarmBar from "./components/watchAlarmBar";
-import WaterNote from "./components/waterNote";
-import AlarmCountByDept from "./components/AlarmCountByDept";
-import WaterCompare from "./components/waterCompare";
+import WaterCountByAreaBar from './components/waterCountByAreaBar'
+import WatchAlarmBar from './components/watchAlarmBar'
+import WaterNote from './components/waterNote'
+import AlarmCountByDept from './components/AlarmCountByDept'
+import WaterCompare from './components/waterCompare'
+import watchGasAlarmBar from './components/watchGasAlarmBar'
+import alarmGasCountByDept from './components/alarmGasCountByDept'
+import corrodeCountByDay from './components/corrodeCountByDay'
 
 export default {
   name: 'Dashboard',
@@ -90,7 +113,29 @@
     WellCountByBfzt,
     WellCountByType,
     DeviceCount,
-    DeviceCountByOnline
+    DeviceCountByOnline,
+    watchGasAlarmBar,
+    alarmGasCountByDept,
+    corrodeCountByDay
+  },
+  data() {
+    return {
+      listQuery1: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区用气量查询条件
+      listQuery2: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      }, // 分区报警查询条件
+      listQuery3: {
+        areaId: '110000',
+        startTime: new Date().Format('yyyy-MM-dd'),
+        endTime: new Date().Format('yyyy-MM-dd')
+      } // 分区报警查询条件
+    }
   },
   computed: {
     ...mapGetters([
@@ -114,20 +159,6 @@
       state.needRefresh = needRefresh
     }
   },
-  data(){
-    return {
-      listQuery1:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      },// 分区用水量查询条件
-      listQuery2:{
-        areaId:'110000',
-        startTime:new Date().Format('yyyy-MM-dd'),
-        endTime:new Date().Format('yyyy-MM-dd')
-      } // 分区报警查询条件
-    }
-  },
   watch: {
     needRefresh(val) {
       // 需要刷新
@@ -145,12 +176,16 @@
       this.$store.dispatch('initWebSocket')
     },
     // 切换分区查询条件
-    changeWaterQuery(listQuery1){
+    changeWaterQuery(listQuery1) {
       this.listQuery1 = listQuery1
     },
     // 切换报警查询条件
-    changeAlarmQuery(listQuery2){
+    changeAlarmQuery(listQuery2) {
       this.listQuery2 = listQuery2
+    },
+    // 切换报警查询条件
+    changeAlarmGasQuery(listQuery3) {
+      this.listQuery3 = listQuery3
     }
   }
 }
diff --git a/src/views/dashboard/index_bak2.vue b/src/views/dashboard/index_bak2.vue
new file mode 100644
index 0000000..b562719
--- /dev/null
+++ b/src/views/dashboard/index_bak2.vue
@@ -0,0 +1,176 @@
+<template>
+  <div class="dashboard-container" style="background-color: white">
+    <panel-group ref="panelgroup"/>
+    <el-row>
+      <!-- 用水统计图 -->
+      <el-col :span="18">
+        <el-card shadow="never">
+          <water-count-by-area-bar @change="changeWaterQuery"/>
+        </el-card>
+      </el-col>
+      <el-col :span="6">
+        <el-card shadow="never">
+          <water-note/>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
+      <!-- 分区用水占比图 -->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-count-by-dept :query="listQuery1" ref="waterCountPie"/>
+        </el-card>
+      </el-col>
+      <!-- 用水走势图 -->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-count-by-day :query="listQuery1" ref="waterCountDay"/>
+        </el-card>
+      </el-col>
+      <!--设备在线数量统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <water-compare/>
+        </el-card>
+      </el-col>
+      <!--设备数量统计-->
+      <el-col :span="12">
+        <el-card shadow="never">
+          <device-count/>
+        </el-card>
+      </el-col>
+      <!--水表报警次数统计，柱状图-->
+      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+        <el-card shadow="never">
+          <watch-alarm-bar @change="changeAlarmQuery"/>
+        </el-card>
+      </el-col>
+      <!--报警饼图统计-->
+      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+        <el-card shadow="never">
+          <alarm-count-by-dept :query="listQuery2"/>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import PanelGroup from './components/PanelGroup'
+import WellCountByBfzt from './components/WellCountByBfzt'
+import WellCountByType from './components/WellCountByType'
+import DeviceCount from './components/DeviceCount'
+import DeviceCountByOnline from './components/DeviceCountByOnline'
+import AlarmByDays from './components/AlarmByDays'
+import JobByStatus from './components/JobByStatus'
+import WaterCountByDept from './components/waterCountByDept'
+import WaterCountByDeptBar from './components/waterCountByDeptBar'
+import WaterCountByDay from './components/waterCountByDay'
+import WaterCountByAreaBar from "./components/waterCountByAreaBar";
+import WatchAlarmBar from "./components/watchAlarmBar";
+import WaterNote from "./components/waterNote";
+import AlarmCountByDept from "./components/AlarmCountByDept";
+import WaterCompare from "./components/waterCompare";
+
+export default {
+  name: 'Dashboard',
+  components: {
+    WaterCompare,
+    AlarmCountByDept,
+    WaterNote,
+    WatchAlarmBar,
+    WaterCountByAreaBar,
+    WaterCountByDay,
+    WaterCountByDeptBar,
+    WaterCountByDept,
+    JobByStatus,
+    AlarmByDays,
+    PanelGroup,
+    WellCountByBfzt,
+    WellCountByType,
+    DeviceCount,
+    DeviceCountByOnline
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'roleNames',
+      'roleTips',
+      'wellTypes',
+      'deviceTypes',
+      'communications',
+      'area'
+    ])
+  },
+  mutations: {
+    SET_WEBSOCKET: (state, websocket) => {
+      state.websocket = websocket
+    },
+    SET_WS_STATUS: (state, wsStatus) => {
+      state.wsStatus = wsStatus
+    },
+    SET_NEED_REFRESH: (state, needRefresh) => {
+      state.needRefresh = needRefresh
+    }
+  },
+  data(){
+    return {
+      listQuery1:{
+        areaId:'110000',
+        startTime:new Date().Format('yyyy-MM-dd'),
+        endTime:new Date().Format('yyyy-MM-dd')
+      },// 分区用水量查询条件
+      listQuery2:{
+        areaId:'110000',
+        startTime:new Date().Format('yyyy-MM-dd'),
+        endTime:new Date().Format('yyyy-MM-dd')
+      } // 分区报警查询条件
+    }
+  },
+  watch: {
+    needRefresh(val) {
+      // 需要刷新
+      if (val) {
+        console.log('refresh dashboard')
+        this.$refs.panelgroup.refresh()
+      }
+    }
+  },
+  mounted() {
+    // this.webSocket()
+  },
+  methods: {
+    webSocket() {
+      this.$store.dispatch('initWebSocket')
+    },
+    // 切换分区查询条件
+    changeWaterQuery(listQuery1){
+      this.listQuery1 = listQuery1
+    },
+    // 切换报警查询条件
+    changeAlarmQuery(listQuery2){
+      this.listQuery2 = listQuery2
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dashboard-container{
+  .el-row{
+    .el-col{
+      margin-bottom: 10px;
+    }
+  }
+}
+.dashboard {
+  &-container {
+    padding: 10px 20px;
+  }
+  &-text {
+    font-size: 30px;
+    line-height: 46px;
+  }
+}
+</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index ea6926c..addba3d 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -7,13 +7,13 @@
       <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
         <list-liquid-data ref="liquiddatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
+      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="气体泄漏监测仪" name="gas">
         <list-gas-data ref="gasdatacomp"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
         <list-dig-data ref="digdatacomp"/>
       </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
+      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="供水泄露监测仪" name="noise">
         <list-noise-data ref="noisedatacomp"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
@@ -25,9 +25,15 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
-      <el-tab-pane label="远传水表" name="water">
+      <el-tab-pane v-if="hasPerm('/waterMeterData/listPage')" label="远传水表" name="water">
         <list-water-data ref="waterdatacomp"/>
       </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/corrodedata/list')" label="腐蚀速率监测仪" name="corrode">
+        <list-corrode-data ref="corrodetacomp"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/gasflowdata/list')" label="气体流量计" name="gasflow">
+        <list-gasflow-data ref="gasflowcomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -40,6 +46,8 @@
 import ListHarmfulData from './deviceData/listHarmfulData'
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
+import ListCorrodeData from './deviceData/listCorrodeData'
+import ListGasflowData from './deviceData/listGasflowData'
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
@@ -47,7 +55,19 @@
 
 export default {
   name: 'DataManage',
-  components: { ListWaterData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: {
+    ListWaterData,
+    ListNoiseData,
+    ListWellLocaData,
+    ListTempData,
+    ListHarmfulData,
+    ListDigData,
+    ListGasData,
+    ListLiquidData,
+    ListWellCoverData,
+    ListCorrodeData,
+    ListGasflowData
+  },
   data() {
     return {
       activeName: 'water'
@@ -90,11 +110,16 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'waater') {
+      } else if (tab.name === 'water') {
         this.$refs.waterdatacomp.fetchData()
+      } else if (tab.name === 'corrode') {
+        this.$refs.corrodetacomp.fetchData()
+      } else if (tab.name === 'gasflow') {
+        this.$refs.gasflowcomp.fetchData()
       }
     },
     changeTab(deviceType) {
+      console.log(deviceType)
       if (deviceType === '1') {
         this.activeName = 'wellcover'
       } else if (deviceType === '2') {
@@ -111,8 +136,12 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
-      } else if (deviceType === '10') {
+      } else if (deviceType === '9') {
         this.activeName = 'water'
+      } else if (deviceType === '10') {
+        this.activeName = 'corrode'
+      } else if (deviceType === '11') {
+        this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
@@ -133,6 +162,10 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else if (hasPermission('/corrodedata/list')) {
+        this.activeName = 'corrode'
+      } else if (hasPermission('/gasflowdata/list')) {
+        this.activeName = 'gasflow'
       } else {
         this.activeName = 'water'
       }
diff --git a/src/views/dataManage/deviceData/listCorrodeData.vue b/src/views/dataManage/deviceData/listCorrodeData.vue
new file mode 100644
index 0000000..fbb44a0
--- /dev/null
+++ b/src/views/dataManage/deviceData/listCorrodeData.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/noisedata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getNoiseData, batchExportNoiseData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+
+export default {
+  name: 'ListCorrodeData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '腐蚀速率(mm/a)',
+          value: 'corrode',
+          align: 'center'
+        },
+        {
+          text: '电量(%)',
+          value: 'cell',
+          width: 80,
+          align: 'center',
+          checkCell: true
+        },
+        // {
+        //   text: '状态描述',
+        //   value: 'descn',
+        //   width: 80,
+        //   align: 'center',
+        //   checkCell: true
+        // },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 开挖配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '8' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportNoiseData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取开挖配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getNoiseData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
new file mode 100644
index 0000000..e67cc7a
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -0,0 +1,289 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" size="small" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/noisedata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getNoiseData, batchExportNoiseData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+
+export default {
+  name: 'ListGasflowData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '瞬时流量',
+          value: '',
+          align: 'center'
+        },
+        {
+          text: '瞬时流速',
+          value: '',
+          align: 'center'
+        },
+        {
+          text: '传感器电压值',
+          value: '',
+          align: 'center'
+        },
+        {
+          text: '累计流量',
+          value: '',
+          align: 'center'
+        },
+        // {
+        //   text: '状态描述',
+        //   value: 'descn',
+        //   width: 80,
+        //   align: 'center',
+        //   checkCell: true
+        // },
+        {
+          text: '权属单位',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 开挖配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '8' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportNoiseData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `噪声记录仪数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取开挖配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getNoiseData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>