diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--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 { gasAlarmBySecondArea } from '@/api/gasOverview'
-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() {
-      gasAlarmBySecondArea(this.query).then(response => {
-        this.chartData.rows = response.data
-      })
-    }
-  }
-}
-</script>

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--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 { gasAlarmBySecondArea } from '@/api/gasOverview'
-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() {
-      gasAlarmBySecondArea(this.query).then(response => {
-        this.chartData.rows = response.data
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <function-area ref="timeFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmBySecondArea } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+export default {
+  name: 'AlarmGasCountByType',
+  components: { FunctionArea },
+  data() {
+    return {
+      query: {
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['deviceName', 'count', '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: {
+          'deviceName': '设备类型',
+          'count': '报警'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.timeFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasAlarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data.map(item => {
+          item.count = item['alarm'] + item['warning']
+          return item
+        })
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--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 { gasAlarmBySecondArea } from '@/api/gasOverview'
-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() {
-      gasAlarmBySecondArea(this.query).then(response => {
-        this.chartData.rows = response.data
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <function-area ref="timeFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmBySecondArea } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+export default {
+  name: 'AlarmGasCountByType',
+  components: { FunctionArea },
+  data() {
+    return {
+      query: {
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['deviceName', 'count', '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: {
+          'deviceName': '设备类型',
+          'count': '报警'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.timeFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasAlarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data.map(item => {
+          item.count = item['alarm'] + item['warning']
+          return item
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+<!--泄漏监测饼图 -->
+<template>
+  <div class="container">
+    <function-area ref="areaFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasLeakStatus } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'AlarmLeakCountPie',
+  components: { FunctionArea2, FunctionArea },
+  data() {
+    return {
+      query: {
+        deviceType: '4',
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['type', 'value'],
+        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}:{c}次<br/>占比：{d}%' }
+      },
+      title: {
+        text: '气体泄漏监测'
+      },
+      chartSettings: {
+        labelMap: {
+          'type': '状态',
+          'value': '数值'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.areaFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasLeakStatus(this.query).then(response => {
+        this.chartData.rows = [
+          { type: '泄漏', value: response.data.leakage },
+          { type: '未泄露', value: response.data.normal }
+        ]
+      })
+    }
+  }
+}
+</script>

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--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 { gasAlarmBySecondArea } from '@/api/gasOverview'
-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() {
-      gasAlarmBySecondArea(this.query).then(response => {
-        this.chartData.rows = response.data
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <function-area ref="timeFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmBySecondArea } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+export default {
+  name: 'AlarmGasCountByType',
+  components: { FunctionArea },
+  data() {
+    return {
+      query: {
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['deviceName', 'count', '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: {
+          'deviceName': '设备类型',
+          'count': '报警'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.timeFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasAlarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data.map(item => {
+          item.count = item['alarm'] + item['warning']
+          return item
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+<!--泄漏监测饼图 -->
+<template>
+  <div class="container">
+    <function-area ref="areaFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasLeakStatus } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'AlarmLeakCountPie',
+  components: { FunctionArea2, FunctionArea },
+  data() {
+    return {
+      query: {
+        deviceType: '4',
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['type', 'value'],
+        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}:{c}次<br/>占比：{d}%' }
+      },
+      title: {
+        text: '气体泄漏监测'
+      },
+      chartSettings: {
+        labelMap: {
+          'type': '状态',
+          'value': '数值'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.areaFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasLeakStatus(this.query).then(response => {
+        this.chartData.rows = [
+          { type: '泄漏', value: response.data.leakage },
+          { type: '未泄露', value: response.data.normal }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index c144bc6..ecd0289 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,7 +45,8 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 30
         },
         yAxis: {
           name: '腐蚀率(%)',

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--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 { gasAlarmBySecondArea } from '@/api/gasOverview'
-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() {
-      gasAlarmBySecondArea(this.query).then(response => {
-        this.chartData.rows = response.data
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <function-area ref="timeFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmBySecondArea } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+export default {
+  name: 'AlarmGasCountByType',
+  components: { FunctionArea },
+  data() {
+    return {
+      query: {
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['deviceName', 'count', '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: {
+          'deviceName': '设备类型',
+          'count': '报警'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.timeFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasAlarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data.map(item => {
+          item.count = item['alarm'] + item['warning']
+          return item
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+<!--泄漏监测饼图 -->
+<template>
+  <div class="container">
+    <function-area ref="areaFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasLeakStatus } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'AlarmLeakCountPie',
+  components: { FunctionArea2, FunctionArea },
+  data() {
+    return {
+      query: {
+        deviceType: '4',
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['type', 'value'],
+        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}:{c}次<br/>占比：{d}%' }
+      },
+      title: {
+        text: '气体泄漏监测'
+      },
+      chartSettings: {
+        labelMap: {
+          'type': '状态',
+          'value': '数值'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.areaFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasLeakStatus(this.query).then(response => {
+        this.chartData.rows = [
+          { type: '泄漏', value: response.data.leakage },
+          { type: '未泄露', value: response.data.normal }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index c144bc6..ecd0289 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,7 +45,8 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 30
         },
         yAxis: {
           name: '腐蚀率(%)',
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="container" style="position: relative">
+    <function-area2 select="week" @change="changeTime"/>
+    <ve-line :data="chartData" :title="titleObj" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmTrend } from '@/api/gasOverview'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'GasAlarmTrend',
+  components: { FunctionArea2 },
+  data() {
+    return {
+      listQuery: {
+        intervalDay: 7
+      },
+      titleObj: {
+        text: '用气超量走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      gasAlarmTrend(this.listQuery).then(response => {
+        let maxValue = 0
+        const typeNames = []
+        const chartDataRows = []
+        if (response.data.length > 0) {
+          response.data.map((item, index) => {
+            typeNames.push(item[0].typeName)
+            for (let i = 0; i < item.length; i++) {
+              let result = {}
+              if (index === 0) {
+                result = { date: item[i].date }
+                chartDataRows.push(result)
+              } else {
+                result = chartDataRows[i]
+              }
+              result[item[i].typeName] = item[i].count
+              if (item[i].count > maxValue) maxValue = item[i].count
+            }
+          })
+          // const area = response.data[0].data.map(item => item.typeTime)
+          this.chartData.columns = ['date', ...typeNames]
+          this.chartSettings.metrics = typeNames
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = chartDataRows
+          if (maxValue < 10) {
+            this.extend.yAxis = { type: 'value', minInterval: 1, max: 5 }
+          } else {
+            this.extend.yAxis = { type: 'value', minInterval: 1 }
+          }
+        }
+      })
+      // 模拟数据
+      // this.chartData.rows = [
+      //   { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
+      // ]
+    },
+    changeTime(days) {
+      this.listQuery.intervalDay = days
+      this.fetchData()
+    }
+  }
+}
+</script>
+

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--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 { gasAlarmBySecondArea } from '@/api/gasOverview'
-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() {
-      gasAlarmBySecondArea(this.query).then(response => {
-        this.chartData.rows = response.data
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <function-area ref="timeFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmBySecondArea } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+export default {
+  name: 'AlarmGasCountByType',
+  components: { FunctionArea },
+  data() {
+    return {
+      query: {
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['deviceName', 'count', '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: {
+          'deviceName': '设备类型',
+          'count': '报警'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.timeFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasAlarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data.map(item => {
+          item.count = item['alarm'] + item['warning']
+          return item
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+<!--泄漏监测饼图 -->
+<template>
+  <div class="container">
+    <function-area ref="areaFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasLeakStatus } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'AlarmLeakCountPie',
+  components: { FunctionArea2, FunctionArea },
+  data() {
+    return {
+      query: {
+        deviceType: '4',
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['type', 'value'],
+        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}:{c}次<br/>占比：{d}%' }
+      },
+      title: {
+        text: '气体泄漏监测'
+      },
+      chartSettings: {
+        labelMap: {
+          'type': '状态',
+          'value': '数值'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.areaFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasLeakStatus(this.query).then(response => {
+        this.chartData.rows = [
+          { type: '泄漏', value: response.data.leakage },
+          { type: '未泄露', value: response.data.normal }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index c144bc6..ecd0289 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,7 +45,8 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 30
         },
         yAxis: {
           name: '腐蚀率(%)',
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="container" style="position: relative">
+    <function-area2 select="week" @change="changeTime"/>
+    <ve-line :data="chartData" :title="titleObj" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmTrend } from '@/api/gasOverview'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'GasAlarmTrend',
+  components: { FunctionArea2 },
+  data() {
+    return {
+      listQuery: {
+        intervalDay: 7
+      },
+      titleObj: {
+        text: '用气超量走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      gasAlarmTrend(this.listQuery).then(response => {
+        let maxValue = 0
+        const typeNames = []
+        const chartDataRows = []
+        if (response.data.length > 0) {
+          response.data.map((item, index) => {
+            typeNames.push(item[0].typeName)
+            for (let i = 0; i < item.length; i++) {
+              let result = {}
+              if (index === 0) {
+                result = { date: item[i].date }
+                chartDataRows.push(result)
+              } else {
+                result = chartDataRows[i]
+              }
+              result[item[i].typeName] = item[i].count
+              if (item[i].count > maxValue) maxValue = item[i].count
+            }
+          })
+          // const area = response.data[0].data.map(item => item.typeTime)
+          this.chartData.columns = ['date', ...typeNames]
+          this.chartSettings.metrics = typeNames
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = chartDataRows
+          if (maxValue < 10) {
+            this.extend.yAxis = { type: 'value', minInterval: 1, max: 5 }
+          } else {
+            this.extend.yAxis = { type: 'value', minInterval: 1 }
+          }
+        }
+      })
+      // 模拟数据
+      // this.chartData.rows = [
+      //   { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
+      // ]
+    },
+    changeTime(days) {
+      this.listQuery.intervalDay = days
+      this.fetchData()
+    }
+  }
+}
+</script>
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
 <template>
-  <div class="container">
-    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  <div class="container" style="position: relative">
+    <function-area2 select="week" @change="changeTime"/>
+    <ve-line :data="chartData" :title="titleObj" :extend="extend" :settings="chartSettings"/>
   </div>
 </template>
 
 <script>
-import { getDayTime } from '@/utils/dateutils'
-import { countByDaySecond } from '@/api/gasOverview'
-import { getDoorAreaTree } from '@/api/system/area'
+import { gasTrend } from '@/api/gasOverview'
+import FunctionArea2 from './FunctionArea2'
 export default {
   name: 'GasCountByDay',
+  components: { FunctionArea2 },
   props: {
-    query: {
-      type: Object,
-      default: () => {
-        return {
-          areaId: '',
-          startTime: '',
-          endTime: ''
-        }
-      }
+    deviceType: {
+      type: String,
+      required: true
+    },
+    title: {
+      type: String,
+      default: '用气走势图'
     }
   },
   data() {
     return {
       listQuery: {
-        startTime: '',
-        endTime: ''
+        deviceType: '', // 设备类型:15,16,17
+        intervalDay: 7
       },
-      title: {
+      titleObj: {
         text: '用气走势图'
       },
       chartSettings: {
@@ -38,10 +37,11 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 20
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '用气量（m³）',
           position: 'left'
         },
         legend: {
@@ -56,50 +56,42 @@
     }
   },
   watch: {
-    query(val) {
-      this.fetchData()
+    deviceType(val) {
+      this.listQuery.deviceType = val
     }
   },
   mounted() {
-    // this.changeTime('month')
-    // this.fetchArea()
+    this.titleObj = {
+      text: this.title
+    }
+    this.fetchData()
   },
   methods: {
-    // 废弃
-    fetchArea() {
-      getDoorAreaTree().then(response => {
-        if (response.code === 200) {
-          debugger
-          const area = response.data.filter(item => {
-            return item.pid === '1'
-          }).map(item => item.name)
-          this.chartSettings.metrics = area
-          this.chartSettings.labelMap = {}
-          for (let i = 0; i < area.length; i++) {
-            this.chartSettings.labelMap[area[i]] = area[i]
-          }
-          this.chartData.columns = ['date', ...area]
-          this.fetchData()
-        }
-      })
-    },
     // 获取数据
     fetchData() {
-      countByDaySecond(this.query).then(response => {
-        console.log(response, '=====用气走势图====')
+      this.listQuery.deviceType = this.deviceType
+      gasTrend(this.listQuery).then(response => {
+        const typeNames = []
+        const chartDataRows = []
         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
+          response.data.map((item, index) => {
+            typeNames.push(item[0].typeName)
+            for (let i = 0; i < item.length; i++) {
+              let result = {}
+              if (index === 0) {
+                result = { date: item[i].date }
+                chartDataRows.push(result)
+              } else {
+                result = chartDataRows[i]
+              }
+              result[item[i].typeName] = item[i].count
             }
-            return result
           })
-          const area = response.data[0].data.map(item => item.areaName)
-          this.chartData.columns = ['date', ...area]
-          this.chartSettings.metrics = area
+          // const area = response.data[0].data.map(item => item.typeTime)
+          this.chartData.columns = ['date', ...typeNames]
+          this.chartSettings.metrics = typeNames
           this.chartSettings.labelMap = { 'date': '日期' }
-          this.chartData.rows = arr
+          this.chartData.rows = chartDataRows
         }
       })
       // 模拟数据
@@ -112,32 +104,8 @@
       //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
       // ]
     },
-    changeTime(timeType) {
-      let startTime
-      switch (timeType) {
-        case 'year':
-          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'halfyear':
-          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case '3month':
-          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'month':
-          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'week':
-          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-      }
-      const endTime = new Date()
-      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
+    changeTime(days) {
+      this.listQuery.intervalDay = days
       this.fetchData()
     }
   }

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--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 { gasAlarmBySecondArea } from '@/api/gasOverview'
-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() {
-      gasAlarmBySecondArea(this.query).then(response => {
-        this.chartData.rows = response.data
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <function-area ref="timeFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmBySecondArea } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+export default {
+  name: 'AlarmGasCountByType',
+  components: { FunctionArea },
+  data() {
+    return {
+      query: {
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['deviceName', 'count', '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: {
+          'deviceName': '设备类型',
+          'count': '报警'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.timeFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasAlarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data.map(item => {
+          item.count = item['alarm'] + item['warning']
+          return item
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+<!--泄漏监测饼图 -->
+<template>
+  <div class="container">
+    <function-area ref="areaFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasLeakStatus } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'AlarmLeakCountPie',
+  components: { FunctionArea2, FunctionArea },
+  data() {
+    return {
+      query: {
+        deviceType: '4',
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['type', 'value'],
+        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}:{c}次<br/>占比：{d}%' }
+      },
+      title: {
+        text: '气体泄漏监测'
+      },
+      chartSettings: {
+        labelMap: {
+          'type': '状态',
+          'value': '数值'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.areaFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasLeakStatus(this.query).then(response => {
+        this.chartData.rows = [
+          { type: '泄漏', value: response.data.leakage },
+          { type: '未泄露', value: response.data.normal }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index c144bc6..ecd0289 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,7 +45,8 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 30
         },
         yAxis: {
           name: '腐蚀率(%)',
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="container" style="position: relative">
+    <function-area2 select="week" @change="changeTime"/>
+    <ve-line :data="chartData" :title="titleObj" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmTrend } from '@/api/gasOverview'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'GasAlarmTrend',
+  components: { FunctionArea2 },
+  data() {
+    return {
+      listQuery: {
+        intervalDay: 7
+      },
+      titleObj: {
+        text: '用气超量走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      gasAlarmTrend(this.listQuery).then(response => {
+        let maxValue = 0
+        const typeNames = []
+        const chartDataRows = []
+        if (response.data.length > 0) {
+          response.data.map((item, index) => {
+            typeNames.push(item[0].typeName)
+            for (let i = 0; i < item.length; i++) {
+              let result = {}
+              if (index === 0) {
+                result = { date: item[i].date }
+                chartDataRows.push(result)
+              } else {
+                result = chartDataRows[i]
+              }
+              result[item[i].typeName] = item[i].count
+              if (item[i].count > maxValue) maxValue = item[i].count
+            }
+          })
+          // const area = response.data[0].data.map(item => item.typeTime)
+          this.chartData.columns = ['date', ...typeNames]
+          this.chartSettings.metrics = typeNames
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = chartDataRows
+          if (maxValue < 10) {
+            this.extend.yAxis = { type: 'value', minInterval: 1, max: 5 }
+          } else {
+            this.extend.yAxis = { type: 'value', minInterval: 1 }
+          }
+        }
+      })
+      // 模拟数据
+      // this.chartData.rows = [
+      //   { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
+      // ]
+    },
+    changeTime(days) {
+      this.listQuery.intervalDay = days
+      this.fetchData()
+    }
+  }
+}
+</script>
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
 <template>
-  <div class="container">
-    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  <div class="container" style="position: relative">
+    <function-area2 select="week" @change="changeTime"/>
+    <ve-line :data="chartData" :title="titleObj" :extend="extend" :settings="chartSettings"/>
   </div>
 </template>
 
 <script>
-import { getDayTime } from '@/utils/dateutils'
-import { countByDaySecond } from '@/api/gasOverview'
-import { getDoorAreaTree } from '@/api/system/area'
+import { gasTrend } from '@/api/gasOverview'
+import FunctionArea2 from './FunctionArea2'
 export default {
   name: 'GasCountByDay',
+  components: { FunctionArea2 },
   props: {
-    query: {
-      type: Object,
-      default: () => {
-        return {
-          areaId: '',
-          startTime: '',
-          endTime: ''
-        }
-      }
+    deviceType: {
+      type: String,
+      required: true
+    },
+    title: {
+      type: String,
+      default: '用气走势图'
     }
   },
   data() {
     return {
       listQuery: {
-        startTime: '',
-        endTime: ''
+        deviceType: '', // 设备类型:15,16,17
+        intervalDay: 7
       },
-      title: {
+      titleObj: {
         text: '用气走势图'
       },
       chartSettings: {
@@ -38,10 +37,11 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 20
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '用气量（m³）',
           position: 'left'
         },
         legend: {
@@ -56,50 +56,42 @@
     }
   },
   watch: {
-    query(val) {
-      this.fetchData()
+    deviceType(val) {
+      this.listQuery.deviceType = val
     }
   },
   mounted() {
-    // this.changeTime('month')
-    // this.fetchArea()
+    this.titleObj = {
+      text: this.title
+    }
+    this.fetchData()
   },
   methods: {
-    // 废弃
-    fetchArea() {
-      getDoorAreaTree().then(response => {
-        if (response.code === 200) {
-          debugger
-          const area = response.data.filter(item => {
-            return item.pid === '1'
-          }).map(item => item.name)
-          this.chartSettings.metrics = area
-          this.chartSettings.labelMap = {}
-          for (let i = 0; i < area.length; i++) {
-            this.chartSettings.labelMap[area[i]] = area[i]
-          }
-          this.chartData.columns = ['date', ...area]
-          this.fetchData()
-        }
-      })
-    },
     // 获取数据
     fetchData() {
-      countByDaySecond(this.query).then(response => {
-        console.log(response, '=====用气走势图====')
+      this.listQuery.deviceType = this.deviceType
+      gasTrend(this.listQuery).then(response => {
+        const typeNames = []
+        const chartDataRows = []
         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
+          response.data.map((item, index) => {
+            typeNames.push(item[0].typeName)
+            for (let i = 0; i < item.length; i++) {
+              let result = {}
+              if (index === 0) {
+                result = { date: item[i].date }
+                chartDataRows.push(result)
+              } else {
+                result = chartDataRows[i]
+              }
+              result[item[i].typeName] = item[i].count
             }
-            return result
           })
-          const area = response.data[0].data.map(item => item.areaName)
-          this.chartData.columns = ['date', ...area]
-          this.chartSettings.metrics = area
+          // const area = response.data[0].data.map(item => item.typeTime)
+          this.chartData.columns = ['date', ...typeNames]
+          this.chartSettings.metrics = typeNames
           this.chartSettings.labelMap = { 'date': '日期' }
-          this.chartData.rows = arr
+          this.chartData.rows = chartDataRows
         }
       })
       // 模拟数据
@@ -112,32 +104,8 @@
       //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
       // ]
     },
-    changeTime(timeType) {
-      let startTime
-      switch (timeType) {
-        case 'year':
-          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'halfyear':
-          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case '3month':
-          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'month':
-          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'week':
-          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-      }
-      const endTime = new Date()
-      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
+    changeTime(days) {
+      this.listQuery.intervalDay = days
       this.fetchData()
     }
   }
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+<template>
+  <div class="container">
+    <function-area ref="func" :today-show="false" select="week" @change="fetchData"/>
+    <ve-histogram v-loading="loading" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import 'echarts/lib/component/visualMap'
+import { gasUsed } from '@/api/gasOverview'
+import FunctionArea from './FunctionArea'
+
+export default {
+  name: 'GasCountByDeviceBar',
+  components: { FunctionArea },
+  data() {
+    return {
+      grid: {
+        left: 40,
+        top: 100,
+        bottom: 5
+      },
+      title: {
+        text: '用气量统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 10
+        },
+        labelMap: {
+          'devcode': '设备',
+          'count': '用气量'
+        },
+        dimension: ['devcode'],
+        metrics: ['count']
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '用气量（m³）',
+          position: 'left'
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 25
+        },
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}m³' }
+      },
+      loading: false,
+      timeRange: [],
+      chartData: {
+        columns: ['devcode', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        beginTime: timeRange[0] + ' 00:00:00',
+        endTime: timeRange[1] + ' 23:59:59'
+      }
+      // this.loading = true
+      gasUsed(params).then(response => {
+        const data = []
+        for (const key in response.data) {
+          data.push({ devcode: key, count: response.data[key] })
+        }
+        this.chartData.rows = data.map(item => {
+          debugger
+          item.count = item.count === '' ? 0 : parseFloat(item.count).toFixed(2)
+          return item
+        })
+        // this.isShow = false
+      })
+    }
+  }
+}
+</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/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--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 { gasAlarmBySecondArea } from '@/api/gasOverview'
-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() {
-      gasAlarmBySecondArea(this.query).then(response => {
-        this.chartData.rows = response.data
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <function-area ref="timeFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmBySecondArea } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+export default {
+  name: 'AlarmGasCountByType',
+  components: { FunctionArea },
+  data() {
+    return {
+      query: {
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['deviceName', 'count', '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: {
+          'deviceName': '设备类型',
+          'count': '报警'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.timeFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasAlarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data.map(item => {
+          item.count = item['alarm'] + item['warning']
+          return item
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+<!--泄漏监测饼图 -->
+<template>
+  <div class="container">
+    <function-area ref="areaFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasLeakStatus } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'AlarmLeakCountPie',
+  components: { FunctionArea2, FunctionArea },
+  data() {
+    return {
+      query: {
+        deviceType: '4',
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['type', 'value'],
+        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}:{c}次<br/>占比：{d}%' }
+      },
+      title: {
+        text: '气体泄漏监测'
+      },
+      chartSettings: {
+        labelMap: {
+          'type': '状态',
+          'value': '数值'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.areaFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasLeakStatus(this.query).then(response => {
+        this.chartData.rows = [
+          { type: '泄漏', value: response.data.leakage },
+          { type: '未泄露', value: response.data.normal }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index c144bc6..ecd0289 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,7 +45,8 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 30
         },
         yAxis: {
           name: '腐蚀率(%)',
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="container" style="position: relative">
+    <function-area2 select="week" @change="changeTime"/>
+    <ve-line :data="chartData" :title="titleObj" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmTrend } from '@/api/gasOverview'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'GasAlarmTrend',
+  components: { FunctionArea2 },
+  data() {
+    return {
+      listQuery: {
+        intervalDay: 7
+      },
+      titleObj: {
+        text: '用气超量走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      gasAlarmTrend(this.listQuery).then(response => {
+        let maxValue = 0
+        const typeNames = []
+        const chartDataRows = []
+        if (response.data.length > 0) {
+          response.data.map((item, index) => {
+            typeNames.push(item[0].typeName)
+            for (let i = 0; i < item.length; i++) {
+              let result = {}
+              if (index === 0) {
+                result = { date: item[i].date }
+                chartDataRows.push(result)
+              } else {
+                result = chartDataRows[i]
+              }
+              result[item[i].typeName] = item[i].count
+              if (item[i].count > maxValue) maxValue = item[i].count
+            }
+          })
+          // const area = response.data[0].data.map(item => item.typeTime)
+          this.chartData.columns = ['date', ...typeNames]
+          this.chartSettings.metrics = typeNames
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = chartDataRows
+          if (maxValue < 10) {
+            this.extend.yAxis = { type: 'value', minInterval: 1, max: 5 }
+          } else {
+            this.extend.yAxis = { type: 'value', minInterval: 1 }
+          }
+        }
+      })
+      // 模拟数据
+      // this.chartData.rows = [
+      //   { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
+      // ]
+    },
+    changeTime(days) {
+      this.listQuery.intervalDay = days
+      this.fetchData()
+    }
+  }
+}
+</script>
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
 <template>
-  <div class="container">
-    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  <div class="container" style="position: relative">
+    <function-area2 select="week" @change="changeTime"/>
+    <ve-line :data="chartData" :title="titleObj" :extend="extend" :settings="chartSettings"/>
   </div>
 </template>
 
 <script>
-import { getDayTime } from '@/utils/dateutils'
-import { countByDaySecond } from '@/api/gasOverview'
-import { getDoorAreaTree } from '@/api/system/area'
+import { gasTrend } from '@/api/gasOverview'
+import FunctionArea2 from './FunctionArea2'
 export default {
   name: 'GasCountByDay',
+  components: { FunctionArea2 },
   props: {
-    query: {
-      type: Object,
-      default: () => {
-        return {
-          areaId: '',
-          startTime: '',
-          endTime: ''
-        }
-      }
+    deviceType: {
+      type: String,
+      required: true
+    },
+    title: {
+      type: String,
+      default: '用气走势图'
     }
   },
   data() {
     return {
       listQuery: {
-        startTime: '',
-        endTime: ''
+        deviceType: '', // 设备类型:15,16,17
+        intervalDay: 7
       },
-      title: {
+      titleObj: {
         text: '用气走势图'
       },
       chartSettings: {
@@ -38,10 +37,11 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 20
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '用气量（m³）',
           position: 'left'
         },
         legend: {
@@ -56,50 +56,42 @@
     }
   },
   watch: {
-    query(val) {
-      this.fetchData()
+    deviceType(val) {
+      this.listQuery.deviceType = val
     }
   },
   mounted() {
-    // this.changeTime('month')
-    // this.fetchArea()
+    this.titleObj = {
+      text: this.title
+    }
+    this.fetchData()
   },
   methods: {
-    // 废弃
-    fetchArea() {
-      getDoorAreaTree().then(response => {
-        if (response.code === 200) {
-          debugger
-          const area = response.data.filter(item => {
-            return item.pid === '1'
-          }).map(item => item.name)
-          this.chartSettings.metrics = area
-          this.chartSettings.labelMap = {}
-          for (let i = 0; i < area.length; i++) {
-            this.chartSettings.labelMap[area[i]] = area[i]
-          }
-          this.chartData.columns = ['date', ...area]
-          this.fetchData()
-        }
-      })
-    },
     // 获取数据
     fetchData() {
-      countByDaySecond(this.query).then(response => {
-        console.log(response, '=====用气走势图====')
+      this.listQuery.deviceType = this.deviceType
+      gasTrend(this.listQuery).then(response => {
+        const typeNames = []
+        const chartDataRows = []
         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
+          response.data.map((item, index) => {
+            typeNames.push(item[0].typeName)
+            for (let i = 0; i < item.length; i++) {
+              let result = {}
+              if (index === 0) {
+                result = { date: item[i].date }
+                chartDataRows.push(result)
+              } else {
+                result = chartDataRows[i]
+              }
+              result[item[i].typeName] = item[i].count
             }
-            return result
           })
-          const area = response.data[0].data.map(item => item.areaName)
-          this.chartData.columns = ['date', ...area]
-          this.chartSettings.metrics = area
+          // const area = response.data[0].data.map(item => item.typeTime)
+          this.chartData.columns = ['date', ...typeNames]
+          this.chartSettings.metrics = typeNames
           this.chartSettings.labelMap = { 'date': '日期' }
-          this.chartData.rows = arr
+          this.chartData.rows = chartDataRows
         }
       })
       // 模拟数据
@@ -112,32 +104,8 @@
       //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
       // ]
     },
-    changeTime(timeType) {
-      let startTime
-      switch (timeType) {
-        case 'year':
-          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'halfyear':
-          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case '3month':
-          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'month':
-          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'week':
-          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-      }
-      const endTime = new Date()
-      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
+    changeTime(days) {
+      this.listQuery.intervalDay = days
       this.fetchData()
     }
   }
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+<template>
+  <div class="container">
+    <function-area ref="func" :today-show="false" select="week" @change="fetchData"/>
+    <ve-histogram v-loading="loading" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import 'echarts/lib/component/visualMap'
+import { gasUsed } from '@/api/gasOverview'
+import FunctionArea from './FunctionArea'
+
+export default {
+  name: 'GasCountByDeviceBar',
+  components: { FunctionArea },
+  data() {
+    return {
+      grid: {
+        left: 40,
+        top: 100,
+        bottom: 5
+      },
+      title: {
+        text: '用气量统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 10
+        },
+        labelMap: {
+          'devcode': '设备',
+          'count': '用气量'
+        },
+        dimension: ['devcode'],
+        metrics: ['count']
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '用气量（m³）',
+          position: 'left'
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 25
+        },
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}m³' }
+      },
+      loading: false,
+      timeRange: [],
+      chartData: {
+        columns: ['devcode', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        beginTime: timeRange[0] + ' 00:00:00',
+        endTime: timeRange[1] + ' 23:59:59'
+      }
+      // this.loading = true
+      gasUsed(params).then(response => {
+        const data = []
+        for (const key in response.data) {
+          data.push({ devcode: key, count: response.data[key] })
+        }
+        this.chartData.rows = data.map(item => {
+          debugger
+          item.count = item.count === '' ? 0 : parseFloat(item.count).toFixed(2)
+          return item
+        })
+        // this.isShow = false
+      })
+    }
+  }
+}
+</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/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
index 6eb2d56..be583f2 100644
--- a/src/views/gasDashboard/index.vue
+++ b/src/views/gasDashboard/index.vue
@@ -2,72 +2,60 @@
   <div class="dashboard-container" style="background-color: white">
     <panel-group ref="panelgroup"/>
     <el-row>
-      <!-- 用气统计图 -->
-      <el-col :span="18">
+      <el-col :span="16">
         <el-card shadow="never">
-          <gas-count-by-area-bar @change="changeWaterQuery"/>
+          <device-count/>
         </el-card>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="8">
         <el-card shadow="never">
           <gas-note />
         </el-card>
       </el-col>
     </el-row>
     <el-row>
-      <!-- 分区用气占比图 -->
       <el-col :span="12">
         <el-card shadow="never">
-          <gas-count-by-dept :query="listQuery1" />
+          <gas-count-by-day title="CO₂气体用量走势图" device-type="15" />
         </el-card>
       </el-col>
       <!-- 用气走势图 -->
       <el-col :span="12">
         <el-card shadow="never">
-          <gas-count-by-day :query="listQuery1" />
+          <gas-count-by-day title="O₂气体用量走势图" device-type="16" />
         </el-card>
       </el-col>
       <!--设备在线数量统计-->
       <el-col :span="12">
         <el-card shadow="never">
-          <gas-compare />
+          <gas-count-by-day title="燃气气体用量走势图" device-type="17" />
         </el-card>
       </el-col>
-      <!--设备数量统计-->
       <el-col :span="12">
         <el-card shadow="never">
-          <device-count/>
+          <gas-count-by-device-bar/>
         </el-card>
       </el-col>
-      <!--气体流量计告警统计，柱状图-->
-      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+      <el-col :span="12">
         <el-card shadow="never">
-          <watch-alarm-bar @change="changeAlarmQuery"/>
+          <alarm-gas-count-by-type/>
         </el-card>
       </el-col>
       <!--报警饼图统计-->
       <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
         <el-card shadow="never">
-          <alarm-count-by-dept :query="listQuery2"/>
+          <alarm-leak-count-pie/>
         </el-card>
       </el-col>
       <!--燃气报警统计，柱状图-->
       <el-col :span="12">
         <el-card shadow="never">
-          <watch-gas-alarm-bar @change="changeAlarmGasQuery"/>
+          <gas-alarm-trend/>
         </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>
@@ -81,19 +69,23 @@
 import DeviceCount from './components/DeviceCount'
 import gasCountByDept from './components/gasCountByDept'
 import gasCountByDay from './components/gasCountByDay'
-import gasCountByAreaBar from './components/gasCountByAreaBar'
+import gasCountByDeviceBar from './components/gasCountByDeviceBar'
 import WatchAlarmBar from './components/watchAlarmBar'
 import gasNote from './components/gasNote'
 import AlarmCountByDept from './components/AlarmCountByDept'
 import gasCompare from './components/gasCompare'
 import watchGasAlarmBar from './components/watchGasAlarmBar'
-import alarmGasCountByDept from './components/alarmGasCountByDept'
+import alarmGasCountByType from './components/alarmGasCountByType'
 import corrodeCountByDay from './components/corrodeCountByDay'
+import AlarmLeakCountPie from './components/alarmLeakCountPie'
+import GasAlarmTrend from './components/gasAlarmTrend'
 
 export default {
   name: 'Dashboard',
   components: {
-    gasCountByAreaBar,
+    GasAlarmTrend,
+    AlarmLeakCountPie,
+    gasCountByDeviceBar,
     gasCountByDept,
     gasCountByDay,
     gasNote,
@@ -103,7 +95,7 @@
     WatchAlarmBar,
     AlarmCountByDept,
     watchGasAlarmBar,
-    alarmGasCountByDept,
+    alarmGasCountByType,
     corrodeCountByDay
   },
   data() {

diff --git a/src/api/gasOverview.js b/src/api/gasOverview.js
index 559a078..0dc3442 100644
--- a/src/api/gasOverview.js
+++ b/src/api/gasOverview.js
@@ -11,14 +11,50 @@
   })
 }
 
-// 气体流量计数量
-// export function deviceCount(params) {
-//   return request({
-//     url: 'device/count/15',
-//     method: 'get',
-//     params
-//   })
-// }
+// 用水量、噪声统计数据
+export function gasStatistic2(deviceType) {
+  return request({
+    url: 'gas/statistics/used',
+    method: 'get',
+    params: {
+      deviceType: deviceType
+    }
+  })
+}
+
+// 气体用气量走势图
+export function gasTrend(params) {
+  return request({
+    url: '/gas/statistics/trend',
+    method: 'get',
+    params
+  })
+}
+// 用气量超量报警统计
+export function gasAlarmTrend(params) {
+  return request({
+    url: '/gas/alarm/trend',
+    method: 'get',
+    params
+  })
+}
+// 各设备气体用气量
+export function gasUsed(params) {
+  return request({
+    url: '/gas/used',
+    method: 'get',
+    params
+  })
+}
+// 气体泄漏监测结果
+export function gasLeakStatus(params) {
+  return request({
+    url: 'gas/leakage/rate',
+    method: 'get',
+    params
+  })
+}
+
 // 气体流量计数量
 export function deviceCount(type) {
   return request({
@@ -56,7 +92,7 @@
 // 查询二级分区燃气告警
 export function gasAlarmBySecondArea(params) {
   return request({
-    url: 'dataStatistic/gasAlarmBySecondArea',
+    url: 'gas/alarm/rate',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue
index 748747b..c9ec32d 100644
--- a/src/components/BigData/Card1/index.vue
+++ b/src/components/BigData/Card1/index.vue
@@ -4,21 +4,11 @@
       <div v-if="icon" :style="backgroundColor" class="card-panel-icon-wrapper">
         <svg-icon :icon-class="icon" class-name="card-panel-icon"/>
       </div>
-      <div v-else style="float:left; width: 10px;height: 100%;"/>
-      <div class="card-panel-description">
-        <!-- <div class="card-panel-text">
-          {{ title[0] }} <span class="card-panel-num">{{ context[0] }}</span>
-        </div>
-        <div class="card-panel-text" >
-          {{ title[1] }} <span class="card-panel-num">{{ context[1] }}</span>
-        </div> -->
-        <div v-if="title.length===2" class="two">
-          <div class="card-panel-text">
-            {{ title[0] }} <span class="card-panel-num">{{ context[0] }}<span
-              style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
-          </div>
-          <div class="card-panel-text">
-            {{ title[1] }} <span class="card-panel-num">{{ context[1] }}<span
+      <!--      <div v-else style="float:left; width: 10px;height: 100%;"/>-->
+      <div class="card-panel-description" style="padding: 0px 15px;">
+        <div v-if="title.length>1" class="two">
+          <div v-for="(name, index) of title" :key="name" class="card-panel-text">
+            {{ name }} <span class="card-panel-num">{{ context[index] }}<span
               style="font-size: 10px;color:#888;margin-left: 5px">{{ unit }}</span></span>
           </div>
         </div>
@@ -41,7 +31,7 @@
   props: {
     title: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['标题', '标题']
       }
     },
@@ -55,7 +45,7 @@
     },
     context: {
       type: Array,
-      default: function () {
+      default: function() {
         return ['--', '--']
       }
     },
@@ -83,6 +73,8 @@
     height: 108px;
     font-size: 12px;
     position: relative;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     color: #666;
     background: #fff;
@@ -96,7 +88,6 @@
     }
 
     .card-panel-icon-wrapper {
-      float: left;
       margin: 14px 0 0 10px;
       padding: 16px 2px;
       transition: all 0.38s ease-out;
@@ -109,25 +100,22 @@
     }
 
     .card-panel-description {
-      float: left;
+      flex:1;
       font-weight: bold;
-      margin-top: 26px;
       overflow: auto;
       margin-left: 5px;
 
       .two {
         .card-panel-text {
-          line-height: 18px;
+          line-height: 26px;
           color: rgba(0, 0, 0, 0.45);
           font-size: 14px;
-          margin-bottom: 12px;
+          display: flex;
+          justify-content: space-between;
         }
-
         .card-panel-num {
           font-size: 18px;
           color: #666;
-          padding-left: 10px;
-          float: right;
         }
       }
       .only {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 97345d9..283c8ef 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -5,7 +5,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8301f8c..03047ac 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -4,7 +4,7 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
       </search-item>
       <search-item v-if="isOperation()" >
         <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 494e254..87586d2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -143,13 +143,12 @@
         this.activeName = 'water'
       } else if (deviceType === '14') {
         this.activeName = 'corrode'
-      } else if (deviceType === '15') {
+      } else if (deviceType === '15' || deviceType === '16' || deviceType === '17') {
         this.activeName = 'gasflow'
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      debugger
       if (hasPermission('/welldata/list')) {
         this.activeName = 'wellcover'
       } else if (hasPermission('/liquiddata/list')) {
diff --git a/src/views/dataManage/deviceData/gasFlowHistory.vue b/src/views/dataManage/deviceData/gasFlowHistory.vue
index e89b673..dcb311a 100644
--- a/src/views/dataManage/deviceData/gasFlowHistory.vue
+++ b/src/views/dataManage/deviceData/gasFlowHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="dialogFormVisible"
-    :title="listQuery.devCode+'历史数据'"
+    :title="listQuery.devcode+'历史数据'"
     width="60%"
     append-to-body
     class="lineDialog"
@@ -61,7 +61,7 @@
       listQuery: {
         offset: 1,
         limit: 20,
-        devCode: '',
+        devcode: '',
         beginTime: '',
         endTime: ''
       },
@@ -72,7 +72,7 @@
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       console.log(row, '========row=====')
-      this.listQuery.devCode = row.devcode
+      this.listQuery.devcode = row.devcode
       this.dialogFormVisible = dialogFormVisible
       const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
       const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
@@ -124,7 +124,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `${this.listQuery.devCode}远程水表历史数据.xlsx` // 下载后文件名
+        downloadElement.download = `${this.listQuery.devcode}远程水表历史数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 97cdfdb..ffb18c6 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -28,7 +28,7 @@
       <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('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/gasdata/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">
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,6 +164,7 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
@@ -191,7 +193,7 @@
         const downloadElement = document.createElement('a')
         const href = window.URL.createObjectURL(blob) // 创建下载的链接
         downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
+        downloadElement.download = `气体泄漏监测仪数据.xlsx` // 下载后文件名
         document.body.appendChild(downloadElement)
         downloadElement.click() // 点击下载
         document.body.removeChild(downloadElement) // 下载完成移除元素
diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue
index 7c7350f..722bd62 100644
--- a/src/views/dataManage/deviceData/listGasflowData.vue
+++ b/src/views/dataManage/deviceData/listGasflowData.vue
@@ -86,6 +86,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import gasFlowHistory from './gasFlowHistory'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasflowData',
@@ -127,21 +128,26 @@
           align: 'center'
         },
         {
-          text: '今日用气量（立方米）',
+          text: '今日用气量（m³）',
           value: 'dayCount',
           align: 'center'
         },
         {
-          text: '本月用气量（立方米）',
+          text: '本月用气量（m³）',
           value: 'monthCount',
           align: 'center'
         },
         {
-          text: '总用气量（立方米）',
+          text: '总用气量（m³）',
           value: 'totalCount',
           align: 'center'
         },
         {
+          text: '阶段用气量（m³）',
+          value: 'peroidCount',
+          align: 'center'
+        },
+        {
           text: '采集时间',
           value: 'uptime',
           align: 'center'
@@ -182,9 +188,10 @@
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '15' && params.devcode) {
+      if (params && (params.deviceType === '15' || params.deviceType === '16' || params.deviceType === '17') && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData()
     }
   },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 5e6a693..dffd340 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -176,9 +176,9 @@
           align: 'center'
         },
         {
-          text: '压力(pa)',
+          text: '压力(Mpa)',
           value: 'pressure',
-          width: 80,
+          width: 90,
           align: 'center'
         },
         {
@@ -317,9 +317,11 @@
       }
       getWatchData(this.listQuery).then((response) => {
         this.list = response.data.rows.map(function(item) {
-          item.areaFullName = item.areaFullName
-            .replace('/', '')
-            .replace('顶层', '')
+          item.totalCount = parseFloat(item.totalCount).toFixed(2)
+          item.dayCount = parseFloat(item.dayCount).toFixed(2)
+          item.monthCount = parseFloat(item.monthCount).toFixed(2)
+          item.pressure = parseFloat(item.pressure).toFixed(2)
+          item.areaFullName = item.areaFullName.replace('/', '').replace('顶层', '')
           return item
         })
         this.total = parseInt(response.data.total)
diff --git a/src/views/gasDashboard/components/DeviceCount.vue b/src/views/gasDashboard/components/DeviceCount.vue
index bb197f8..bffc9e9 100644
--- a/src/views/gasDashboard/components/DeviceCount.vue
+++ b/src/views/gasDashboard/components/DeviceCount.vue
@@ -53,6 +53,14 @@
       }
       deviceStaticsByType(data).then(response => {
         this.chartData.rows = response.data
+        const maxValue = Math.max.apply(Math, response.data.map(function(item) {
+          return parseInt(item.deviceCount)
+        }))
+        if (maxValue < 10) {
+          this.extend.xAxis = { type: 'value', minInterval: 1, max: 5 }
+        } else {
+          this.extend.xAxis = { type: 'value', minInterval: 1 }
+        }
       })
     }
   }
diff --git a/src/views/gasDashboard/components/FunctionArea.vue b/src/views/gasDashboard/components/FunctionArea.vue
index 4c05cee..6401557 100644
--- a/src/views/gasDashboard/components/FunctionArea.vue
+++ b/src/views/gasDashboard/components/FunctionArea.vue
@@ -5,11 +5,11 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" :class="{'checked-btn':selected=='year'}" @click="setDefaultTime('year')">本年度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='season'}" @click="setDefaultTime('season')">本季度</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='month'}" @click="setDefaultTime('month')">近30日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='week'}" @click="setDefaultTime('week')">近7日</el-button>
-    <el-button round size="mini" :class="{'checked-btn':selected=='today'}" @click="setDefaultTime('today')">今日</el-button>
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+    <el-button v-show="todayShow" :class="{'checked-btn':selected=='today'}" round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
       :picker-options="pickerOptions"
@@ -25,80 +25,83 @@
 </template>
 
 <script>
-  import { getDayTime } from '@/utils/dateutils'
-  export default {
-    name: "FunctionArea",
-    props:{
-      select:{
-        type: String,
-        default: 'today'
-      }
+import { getDayTime } from '@/utils/dateutils'
+export default {
+  name: 'FunctionArea',
+  props: {
+    select: {
+      type: String,
+      default: 'today'
     },
-    data() {
-      return {
-        selected:'',
-        timeRange: [],
-        pickerOptions: {
-          disabledDate: function(date) {
-            var oDate1 = new Date(date)
-            var oDate2 = new Date()
-            if (oDate1.getTime() > oDate2.getTime()) {
-              return true
-            } else {
-              return false
-            }
+    todayShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      timeRange: [],
+      pickerOptions: {
+        disabledDate: function(date) {
+          var oDate1 = new Date(date)
+          var oDate2 = new Date()
+          if (oDate1.getTime() > oDate2.getTime()) {
+            return true
+          } else {
+            return false
           }
         }
       }
+    }
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
     },
-    methods: {
-      init(){
-        this.setDefaultTime(this.select)
-      },
-      change(type){
-        this.$emit('change', this.timeRange, type )
-      },
-      setDefaultTime(val) {
-        this.selected = val
-        if (val === 'year') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          const beginTime = tYear + '-01-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }if (val === 'season') {
-          var today = new Date()
-          var tYear = today.getFullYear()
-          var tMonth = today.getMonth() + 1
-          const oldMonth = tMonth<4?'01':(tMonth<7?'04':(tMonth<10?'07':'10'))
-          const beginTime = tYear + '-' + oldMonth + '-01'
-          const endTime = getDayTime(new Date().getTime())
-          this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') { // 30日
-          // var today = new Date()
-          // var tYear = today.getFullYear()
-          // var tMonth = today.getMonth() + 1
-          // if (tMonth.toString().length === 1) {
-          //   tMonth = '0' + tMonth
-          // }
-          // const beginTime = tYear + '-' + tMonth + '-01'
-          // const endTime = getDayTime(new Date().getTime())
-          // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-
-        } else if (val === 'week') {
-          // const nowDayOfWeek =  new Date().getDay()-1
-          const nowDayOfWeek =  6
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        } else if (val === 'yesterday') {
-          this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
-        } else if (val === 'today') {
-          this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
-        }
-        this.change(val)
+    change(type) {
+      this.$emit('change', this.timeRange, type)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        const beginTime = tYear + '-01-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } if (val === 'season') {
+        var today = new Date()
+        var tYear = today.getFullYear()
+        var tMonth = today.getMonth() + 1
+        const oldMonth = tMonth < 4 ? '01' : (tMonth < 7 ? '04' : (tMonth < 10 ? '07' : '10'))
+        const beginTime = tYear + '-' + oldMonth + '-01'
+        const endTime = getDayTime(new Date().getTime())
+        this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      } else if (val === 'month') { // 30日
+        // var today = new Date()
+        // var tYear = today.getFullYear()
+        // var tMonth = today.getMonth() + 1
+        // if (tMonth.toString().length === 1) {
+        //   tMonth = '0' + tMonth
+        // }
+        // const beginTime = tYear + '-' + tMonth + '-01'
+        // const endTime = getDayTime(new Date().getTime())
+        // this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 29 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'week') {
+        // const nowDayOfWeek =  new Date().getDay()-1
+        const nowDayOfWeek = 6
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * nowDayOfWeek * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
+      } else if (val === 'yesterday') {
+        this.timeRange = [getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd'), getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000).Format('yyyy-MM-dd')]
+      } else if (val === 'today') {
+        this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
+      this.change(val)
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/gasDashboard/components/FunctionArea2.vue b/src/views/gasDashboard/components/FunctionArea2.vue
new file mode 100644
index 0000000..26a9f82
--- /dev/null
+++ b/src/views/gasDashboard/components/FunctionArea2.vue
@@ -0,0 +1,107 @@
+<!--
+ * @Description: 时间筛选器
+ * @Author: 王晓颖
+ * @Date:
+ -->
+<template>
+  <div class="statistic-container">
+    <el-button :class="{'checked-btn':selected=='year'}" round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button :class="{'checked-btn':selected=='season'}" round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button :class="{'checked-btn':selected=='month'}" round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button :class="{'checked-btn':selected=='week'}" round size="mini" @click="setDefaultTime('week')">近7日</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FunctionArea2',
+  props: {
+    select: {
+      type: String,
+      default: 'week'
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      days: 7
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.setDefaultTime(this.select)
+    },
+    change(type) {
+      this.$emit('change', this.days)
+    },
+    setDefaultTime(val) {
+      this.selected = val
+      if (val === 'year') {
+        const currentYear = new Date().getFullYear().toString()
+        const hasTimestamp = new Date() - new Date(currentYear)
+        this.days = Math.ceil(hasTimestamp / 86400000)
+      } if (val === 'season') {
+        var month = new Date().getMonth() // 获取当前月份
+        let newmonth // 季度第一天
+        if (month < 3) {
+          newmonth = new Date(new Date().setMonth(0))
+        } else if (month > 2 && month < 6) {
+          newmonth = new Date(new Date().setMonth(3))
+        } else if (month > 5 && month < 9) {
+          newmonth = new Date(new Date().setMonth(6))
+        } else if (month > 8 && month < 11) {
+          newmonth = new Date(new Date().setMonth(9))
+        }
+        const thisseason1 = new Date(newmonth.setDate(1))
+        const hasTimestamp = new Date() - thisseason1
+        this.days = Math.ceil(hasTimestamp / 86400000) + 1
+      } else if (val === 'month') { // 30日
+        this.days = 30
+      } else if (val === 'week') {
+        this.days = 7
+      }
+      this.change(val)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .statistic-container {
+    //position: absolute;
+    //top: 0px;
+    //right: 10px;
+    .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;
+  }
+  .checked-btn{
+    color: #278DF9;
+    border-color: #beddfd;
+    background-color: #e9f4fe;
+  }
+</style>
diff --git a/src/views/gasDashboard/components/PanelGroup.vue b/src/views/gasDashboard/components/PanelGroup.vue
index 803b666..5613860 100644
--- a/src/views/gasDashboard/components/PanelGroup.vue
+++ b/src/views/gasDashboard/components/PanelGroup.vue
@@ -17,6 +17,7 @@
 import Card from '@/components/BigData/Card'
 // 首页
 import { gasStatistic, deviceCount, alarmNowStatic } from '@/api/gasOverview'
+import { gasStatistic2 } from '../../../api/gasOverview'
 export default {
   components: {
     Card,
@@ -26,40 +27,40 @@
     return {
       dataGroup1: [
         {
-          title: ['总用气量', '本月用气量'],
-          context: ['--', '--'],
+          title: ['CO₂总用气量', 'CO₂本月用气量', 'CO₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#40c9c6',
-          unit: '吨',
+          unit: 'Nm³',
           index: 0
         },
         {
-          title: ['今日用气量', '生产厂区用气量'],
-          context: ['--', '--'],
+          title: ['O₂总用气量', 'O₂本月用气量', 'O₂今日用气量'],
+          context: ['--', '--', '--'],
           icon: '',
           color: '#36a3f7',
-          unit: '吨',
+          unit: 'Nm³',
           index: 1
         },
         {
+          title: ['燃气总用气量', '燃气本月用气量', '燃气今日用气量'],
+          context: ['--', '--', '--'],
+          icon: '',
+          color: '#36a3f7',
+          unit: 'Nm³',
+          index: 2
+        },
+        {
           title: ['滑道实时噪声'],
           context: ['--'],
           icon: 'icon-noise',
           color: '#f1c353',
           unit: 'db',
-          index: 2
+          index: 3
         }
       ],
       dataGroup: [
         {
-          title: '气体流量计',
-          context: '--',
-          icon: 'icon-watch',
-          color: '#9694f7',
-          path: '/deviceList?deviceType=15',
-          permission: '/device/list'
-        },
-        {
           title: '告警信息',
           context: '--',
           icon: 'icon-alarm',
@@ -73,7 +74,7 @@
   mounted() {
     this.getWater()
     // this.getWellCount()
-    this.getDeviceCount()
+    // this.getDeviceCount()
     this.getAlarmCount()
   },
   methods: {
@@ -83,19 +84,21 @@
     getWater() {
       // 用气量
       gasStatistic().then(response => {
-        this.dataGroup1[0].context = [response.data.total ? parseFloat(response.data.total).toFixed(2) : '--', response.data.month ? parseFloat(response.data.month).toFixed(2) : '--']
-        this.dataGroup1[1].context = [response.data.today ? parseFloat(response.data.today).toFixed(2) : '--', response.data.prodution ? parseFloat(response.data.prodution).toFixed(2) : '--']
-        this.dataGroup1[2].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
+        this.dataGroup1[3].context = [response.data.sound ? Number(response.data.sound).toFixed(2) : '--']
       })
-    },
-    getDeviceCount() {
-      deviceCount('15').then(response => {
-        this.dataGroup[0].context = response.data
+      gasStatistic2('15').then(response => {
+        this.dataGroup1[0].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('16').then(response => {
+        this.dataGroup1[1].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
+      })
+      gasStatistic2('17').then(response => {
+        this.dataGroup1[2].context = [response.data.total.toFixed(2), response.data.month.toFixed(2), response.data.day === '' ? '--' : response.data.day.toFixed(2)]
       })
     },
     getAlarmCount() {
       alarmNowStatic().then(response => {
-        this.dataGroup[1].context = response.data.total
+        this.dataGroup[0].context = response.data.total
       })
     }
   }
diff --git a/src/views/gasDashboard/components/alarmGasCountByDept.vue b/src/views/gasDashboard/components/alarmGasCountByDept.vue
deleted file mode 100644
index b8bfc23..0000000
--- a/src/views/gasDashboard/components/alarmGasCountByDept.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--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 { gasAlarmBySecondArea } from '@/api/gasOverview'
-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() {
-      gasAlarmBySecondArea(this.query).then(response => {
-        this.chartData.rows = response.data
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/gasDashboard/components/alarmGasCountByType.vue b/src/views/gasDashboard/components/alarmGasCountByType.vue
new file mode 100644
index 0000000..4f80d3a
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmGasCountByType.vue
@@ -0,0 +1,72 @@
+<!--suppress ALL -->
+<template>
+  <div class="container">
+    <function-area ref="timeFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmBySecondArea } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+export default {
+  name: 'AlarmGasCountByType',
+  components: { FunctionArea },
+  data() {
+    return {
+      query: {
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['deviceName', 'count', '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: {
+          'deviceName': '设备类型',
+          'count': '报警'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.timeFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasAlarmBySecondArea(this.query).then(response => {
+        this.chartData.rows = response.data.map(item => {
+          item.count = item['alarm'] + item['warning']
+          return item
+        })
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/alarmLeakCountPie.vue b/src/views/gasDashboard/components/alarmLeakCountPie.vue
new file mode 100644
index 0000000..abfbc2d
--- /dev/null
+++ b/src/views/gasDashboard/components/alarmLeakCountPie.vue
@@ -0,0 +1,74 @@
+<!--泄漏监测饼图 -->
+<template>
+  <div class="container">
+    <function-area ref="areaFunc" :today-show="false" select="week" @change="changeTime"/>
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  </div>
+</template>
+
+<script>
+import { gasLeakStatus } from '@/api/gasOverview'
+import FunctionArea from '../../dashboard/components/FunctionArea'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'AlarmLeakCountPie',
+  components: { FunctionArea2, FunctionArea },
+  data() {
+    return {
+      query: {
+        deviceType: '4',
+        beginTime: '',
+        endTime: ''
+      },
+      chartData: {
+        columns: ['type', 'value'],
+        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}:{c}次<br/>占比：{d}%' }
+      },
+      title: {
+        text: '气体泄漏监测'
+      },
+      chartSettings: {
+        labelMap: {
+          'type': '状态',
+          'value': '数值'
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs.areaFunc.init()
+  },
+  methods: {
+    changeTime(timeRange) {
+      this.query.beginTime = timeRange[0]
+      this.query.endTime = timeRange[1]
+      this.fetchData()
+    },
+    // 获取统计数据
+    fetchData() {
+      gasLeakStatus(this.query).then(response => {
+        this.chartData.rows = [
+          { type: '泄漏', value: response.data.leakage },
+          { type: '未泄露', value: response.data.normal }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue
index c144bc6..ecd0289 100644
--- a/src/views/gasDashboard/components/corrodeCountByDay.vue
+++ b/src/views/gasDashboard/components/corrodeCountByDay.vue
@@ -45,7 +45,8 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 30
         },
         yAxis: {
           name: '腐蚀率(%)',
diff --git a/src/views/gasDashboard/components/gasAlarmTrend.vue b/src/views/gasDashboard/components/gasAlarmTrend.vue
new file mode 100644
index 0000000..a1d422e
--- /dev/null
+++ b/src/views/gasDashboard/components/gasAlarmTrend.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="container" style="position: relative">
+    <function-area2 select="week" @change="changeTime"/>
+    <ve-line :data="chartData" :title="titleObj" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import { gasAlarmTrend } from '@/api/gasOverview'
+import FunctionArea2 from './FunctionArea2'
+export default {
+  name: 'GasAlarmTrend',
+  components: { FunctionArea2 },
+  data() {
+    return {
+      listQuery: {
+        intervalDay: 7
+      },
+      titleObj: {
+        text: '用气超量走势图'
+      },
+      chartSettings: {
+        labelMap: { date: '日期' },
+        metrics: [],
+        dimension: ['date']
+      },
+      extend: {
+        grid: {
+          top: 120
+        },
+        yAxis: {
+          name: '报警次数',
+          position: 'left'
+        },
+        legend: {
+          // type: 'scroll',
+          top: '40px'
+        }
+      },
+      chartData: {
+        columns: [],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取数据
+    fetchData() {
+      gasAlarmTrend(this.listQuery).then(response => {
+        let maxValue = 0
+        const typeNames = []
+        const chartDataRows = []
+        if (response.data.length > 0) {
+          response.data.map((item, index) => {
+            typeNames.push(item[0].typeName)
+            for (let i = 0; i < item.length; i++) {
+              let result = {}
+              if (index === 0) {
+                result = { date: item[i].date }
+                chartDataRows.push(result)
+              } else {
+                result = chartDataRows[i]
+              }
+              result[item[i].typeName] = item[i].count
+              if (item[i].count > maxValue) maxValue = item[i].count
+            }
+          })
+          // const area = response.data[0].data.map(item => item.typeTime)
+          this.chartData.columns = ['date', ...typeNames]
+          this.chartSettings.metrics = typeNames
+          this.chartSettings.labelMap = { 'date': '日期' }
+          this.chartData.rows = chartDataRows
+          if (maxValue < 10) {
+            this.extend.yAxis = { type: 'value', minInterval: 1, max: 5 }
+          } else {
+            this.extend.yAxis = { type: 'value', minInterval: 1 }
+          }
+        }
+      })
+      // 模拟数据
+      // this.chartData.rows = [
+      //   { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
+      // ]
+    },
+    changeTime(days) {
+      this.listQuery.intervalDay = days
+      this.fetchData()
+    }
+  }
+}
+</script>
+
diff --git a/src/views/gasDashboard/components/gasCountByDay.vue b/src/views/gasDashboard/components/gasCountByDay.vue
index 79a4efb..f0a3977 100644
--- a/src/views/gasDashboard/components/gasCountByDay.vue
+++ b/src/views/gasDashboard/components/gasCountByDay.vue
@@ -1,34 +1,33 @@
 <template>
-  <div class="container">
-    <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+  <div class="container" style="position: relative">
+    <function-area2 select="week" @change="changeTime"/>
+    <ve-line :data="chartData" :title="titleObj" :extend="extend" :settings="chartSettings"/>
   </div>
 </template>
 
 <script>
-import { getDayTime } from '@/utils/dateutils'
-import { countByDaySecond } from '@/api/gasOverview'
-import { getDoorAreaTree } from '@/api/system/area'
+import { gasTrend } from '@/api/gasOverview'
+import FunctionArea2 from './FunctionArea2'
 export default {
   name: 'GasCountByDay',
+  components: { FunctionArea2 },
   props: {
-    query: {
-      type: Object,
-      default: () => {
-        return {
-          areaId: '',
-          startTime: '',
-          endTime: ''
-        }
-      }
+    deviceType: {
+      type: String,
+      required: true
+    },
+    title: {
+      type: String,
+      default: '用气走势图'
     }
   },
   data() {
     return {
       listQuery: {
-        startTime: '',
-        endTime: ''
+        deviceType: '', // 设备类型:15,16,17
+        intervalDay: 7
       },
-      title: {
+      titleObj: {
         text: '用气走势图'
       },
       chartSettings: {
@@ -38,10 +37,11 @@
       },
       extend: {
         grid: {
-          top: 120
+          top: 120,
+          left: 20
         },
         yAxis: {
-          name: '用气量（吨）',
+          name: '用气量（m³）',
           position: 'left'
         },
         legend: {
@@ -56,50 +56,42 @@
     }
   },
   watch: {
-    query(val) {
-      this.fetchData()
+    deviceType(val) {
+      this.listQuery.deviceType = val
     }
   },
   mounted() {
-    // this.changeTime('month')
-    // this.fetchArea()
+    this.titleObj = {
+      text: this.title
+    }
+    this.fetchData()
   },
   methods: {
-    // 废弃
-    fetchArea() {
-      getDoorAreaTree().then(response => {
-        if (response.code === 200) {
-          debugger
-          const area = response.data.filter(item => {
-            return item.pid === '1'
-          }).map(item => item.name)
-          this.chartSettings.metrics = area
-          this.chartSettings.labelMap = {}
-          for (let i = 0; i < area.length; i++) {
-            this.chartSettings.labelMap[area[i]] = area[i]
-          }
-          this.chartData.columns = ['date', ...area]
-          this.fetchData()
-        }
-      })
-    },
     // 获取数据
     fetchData() {
-      countByDaySecond(this.query).then(response => {
-        console.log(response, '=====用气走势图====')
+      this.listQuery.deviceType = this.deviceType
+      gasTrend(this.listQuery).then(response => {
+        const typeNames = []
+        const chartDataRows = []
         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
+          response.data.map((item, index) => {
+            typeNames.push(item[0].typeName)
+            for (let i = 0; i < item.length; i++) {
+              let result = {}
+              if (index === 0) {
+                result = { date: item[i].date }
+                chartDataRows.push(result)
+              } else {
+                result = chartDataRows[i]
+              }
+              result[item[i].typeName] = item[i].count
             }
-            return result
           })
-          const area = response.data[0].data.map(item => item.areaName)
-          this.chartData.columns = ['date', ...area]
-          this.chartSettings.metrics = area
+          // const area = response.data[0].data.map(item => item.typeTime)
+          this.chartData.columns = ['date', ...typeNames]
+          this.chartSettings.metrics = typeNames
           this.chartSettings.labelMap = { 'date': '日期' }
-          this.chartData.rows = arr
+          this.chartData.rows = chartDataRows
         }
       })
       // 模拟数据
@@ -112,32 +104,8 @@
       //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
       // ]
     },
-    changeTime(timeType) {
-      let startTime
-      switch (timeType) {
-        case 'year':
-          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'halfyear':
-          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case '3month':
-          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'month':
-          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-        case 'week':
-          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
-          break
-      }
-      const endTime = new Date()
-      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
+    changeTime(days) {
+      this.listQuery.intervalDay = days
       this.fetchData()
     }
   }
diff --git a/src/views/gasDashboard/components/gasCountByDeviceBar.vue b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
new file mode 100644
index 0000000..dc211e3
--- /dev/null
+++ b/src/views/gasDashboard/components/gasCountByDeviceBar.vue
@@ -0,0 +1,130 @@
+<template>
+  <div class="container">
+    <function-area ref="func" :today-show="false" select="week" @change="fetchData"/>
+    <ve-histogram v-loading="loading" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  </div>
+</template>
+
+<script>
+import 'echarts/lib/component/visualMap'
+import { gasUsed } from '@/api/gasOverview'
+import FunctionArea from './FunctionArea'
+
+export default {
+  name: 'GasCountByDeviceBar',
+  components: { FunctionArea },
+  data() {
+    return {
+      grid: {
+        left: 40,
+        top: 100,
+        bottom: 5
+      },
+      title: {
+        text: '用气量统计'
+      },
+      chartSettings: {
+        itemStyle: {
+          barCategoryGap: 10
+        },
+        labelMap: {
+          'devcode': '设备',
+          'count': '用气量'
+        },
+        dimension: ['devcode'],
+        metrics: ['count']
+      },
+      extend: {
+        legend: {
+          show: true
+        },
+        xAxis: {
+          axisLabel: {
+            rotate: 30,
+            margin: 30,
+            textStyle: {
+              align: 'center'
+            }
+          }
+        },
+        yAxis: {
+          name: '用气量（m³）',
+          position: 'left'
+        },
+        series: {
+          label: { show: true, position: 'top', formatter: '{c}' },
+          barWidth: 25
+        },
+        tooltip: { trigger: 'item', formatter: '{b}<br/>用气量：{c}m³' }
+      },
+      loading: false,
+      timeRange: [],
+      chartData: {
+        columns: ['devcode', 'count'],
+        rows: []
+      }
+    }
+  },
+  mounted() {
+    this.$refs.func.init()
+  },
+  methods: {
+    fetchData(timeRange) {
+      const params = {
+        beginTime: timeRange[0] + ' 00:00:00',
+        endTime: timeRange[1] + ' 23:59:59'
+      }
+      // this.loading = true
+      gasUsed(params).then(response => {
+        const data = []
+        for (const key in response.data) {
+          data.push({ devcode: key, count: response.data[key] })
+        }
+        this.chartData.rows = data.map(item => {
+          debugger
+          item.count = item.count === '' ? 0 : parseFloat(item.count).toFixed(2)
+          return item
+        })
+        // this.isShow = false
+      })
+    }
+  }
+}
+</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/gasDashboard/index.vue b/src/views/gasDashboard/index.vue
index 6eb2d56..be583f2 100644
--- a/src/views/gasDashboard/index.vue
+++ b/src/views/gasDashboard/index.vue
@@ -2,72 +2,60 @@
   <div class="dashboard-container" style="background-color: white">
     <panel-group ref="panelgroup"/>
     <el-row>
-      <!-- 用气统计图 -->
-      <el-col :span="18">
+      <el-col :span="16">
         <el-card shadow="never">
-          <gas-count-by-area-bar @change="changeWaterQuery"/>
+          <device-count/>
         </el-card>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="8">
         <el-card shadow="never">
           <gas-note />
         </el-card>
       </el-col>
     </el-row>
     <el-row>
-      <!-- 分区用气占比图 -->
       <el-col :span="12">
         <el-card shadow="never">
-          <gas-count-by-dept :query="listQuery1" />
+          <gas-count-by-day title="CO₂气体用量走势图" device-type="15" />
         </el-card>
       </el-col>
       <!-- 用气走势图 -->
       <el-col :span="12">
         <el-card shadow="never">
-          <gas-count-by-day :query="listQuery1" />
+          <gas-count-by-day title="O₂气体用量走势图" device-type="16" />
         </el-card>
       </el-col>
       <!--设备在线数量统计-->
       <el-col :span="12">
         <el-card shadow="never">
-          <gas-compare />
+          <gas-count-by-day title="燃气气体用量走势图" device-type="17" />
         </el-card>
       </el-col>
-      <!--设备数量统计-->
       <el-col :span="12">
         <el-card shadow="never">
-          <device-count/>
+          <gas-count-by-device-bar/>
         </el-card>
       </el-col>
-      <!--气体流量计告警统计，柱状图-->
-      <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
+      <el-col :span="12">
         <el-card shadow="never">
-          <watch-alarm-bar @change="changeAlarmQuery"/>
+          <alarm-gas-count-by-type/>
         </el-card>
       </el-col>
       <!--报警饼图统计-->
       <el-col v-if="hasPerm('/statics/alarmsByDay')" :span="12">
         <el-card shadow="never">
-          <alarm-count-by-dept :query="listQuery2"/>
+          <alarm-leak-count-pie/>
         </el-card>
       </el-col>
       <!--燃气报警统计，柱状图-->
       <el-col :span="12">
         <el-card shadow="never">
-          <watch-gas-alarm-bar @change="changeAlarmGasQuery"/>
+          <gas-alarm-trend/>
         </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>
@@ -81,19 +69,23 @@
 import DeviceCount from './components/DeviceCount'
 import gasCountByDept from './components/gasCountByDept'
 import gasCountByDay from './components/gasCountByDay'
-import gasCountByAreaBar from './components/gasCountByAreaBar'
+import gasCountByDeviceBar from './components/gasCountByDeviceBar'
 import WatchAlarmBar from './components/watchAlarmBar'
 import gasNote from './components/gasNote'
 import AlarmCountByDept from './components/AlarmCountByDept'
 import gasCompare from './components/gasCompare'
 import watchGasAlarmBar from './components/watchGasAlarmBar'
-import alarmGasCountByDept from './components/alarmGasCountByDept'
+import alarmGasCountByType from './components/alarmGasCountByType'
 import corrodeCountByDay from './components/corrodeCountByDay'
+import AlarmLeakCountPie from './components/alarmLeakCountPie'
+import GasAlarmTrend from './components/gasAlarmTrend'
 
 export default {
   name: 'Dashboard',
   components: {
-    gasCountByAreaBar,
+    GasAlarmTrend,
+    AlarmLeakCountPie,
+    gasCountByDeviceBar,
     gasCountByDept,
     gasCountByDay,
     gasNote,
@@ -103,7 +95,7 @@
     WatchAlarmBar,
     AlarmCountByDept,
     watchGasAlarmBar,
-    alarmGasCountByDept,
+    alarmGasCountByType,
     corrodeCountByDay
   },
   data() {
diff --git a/static/project.config.json b/static/project.config.json
index 7b9a3c3..0215df1 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "场区能源管理系统",
+  "title": "生产及办公能耗管理系统",
   "baseUrl": "http://111.198.10.15:20104/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,